Skip to content

Commit

Permalink
Merge pull request #229 from lukaspj/Fix-Taml-JSON
Browse files Browse the repository at this point in the history
Taml - JSON fix
  • Loading branch information
lilligreen committed Jul 31, 2014
2 parents 78e8575 + bc3fe63 commit c485619
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion engine/source/persistence/taml/json/tamlJSONReader.cc
Expand Up @@ -45,6 +45,7 @@ SimObject* TamlJSONReader::read( FileStream& stream )
Con::warnf("TamlJSONReader::read() - Could not load Taml JSON file from stream.");
return NULL;
}
jsonText[streamSize] = NULL;

// Create JSON document.
rapidjson::Document document;
Expand Down Expand Up @@ -662,7 +663,7 @@ inline const char* TamlJSONReader::getTamlObjectName( const rapidjson::Value& va
StringTableEntry attributeName = StringTable->insert( memberItr->name.GetString() );

// Skip if not the correct attribute.
if ( attributeName != tamlRefToIdName )
if ( attributeName != tamlNamedObjectName )
continue;

// Is the value an integer?
Expand Down

0 comments on commit c485619

Please sign in to comment.