games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Fix.

Browse Source
This commit is contained in:
AlexVinS
2016-01-23 17:43:20 +03:00
parent a638d0cd51
commit b0c4ea5947
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CArmedInstance.cpp
View File

@@ -136,11 +136,11 @@ CBonusSystemNode * CArmedInstance::whatShouldBeAttached()
void CArmedInstance::writeJsonOptions(JsonNode& json) const void CArmedInstance::writeJsonOptions(JsonNode& json) const
{ {
CGObjectInstance::writeJsonOptions(json); CGObjectInstance::writeJsonOptions(json);
CCreatureSet::writeJson(json); CCreatureSet::writeJson(json["army"]);
} }
void CArmedInstance::readJsonOptions(const JsonNode& json) void CArmedInstance::readJsonOptions(const JsonNode& json)
{ {
CGObjectInstance::readJsonOptions(json); CGObjectInstance::readJsonOptions(json);
CCreatureSet::readJson(json); CCreatureSet::readJson(json["army"]);
} }

5
lib/mapObjects/CObjectHandler.cpp
View File

@@ -352,9 +352,10 @@ void CGObjectInstance::readJson(const JsonNode & json)
pos.z = json["l"].Float(); pos.z = json["l"].Float();
appearance.readJson(json["template"], false); appearance.readJson(json["template"], false);
readJsonOptions(json["options"]);
logGlobal->debugStream() <<"Load: [" << pos << "] " << id << " " << ID << " " << subID << " " << typeName << " " << subTypeName; logGlobal->debugStream() <<"Loading: [" << pos << "] " << id << " " << ID << " " << subID << " " << typeName << " " << subTypeName;
readJsonOptions(json["options"]);
} }
void CGObjectInstance::writeJsonOptions(JsonNode & json) const void CGObjectInstance::writeJsonOptions(JsonNode & json) const