diff --git a/lib/mapObjects/CArmedInstance.cpp b/lib/mapObjects/CArmedInstance.cpp index 15964eb4b..6b3b647e6 100644 --- a/lib/mapObjects/CArmedInstance.cpp +++ b/lib/mapObjects/CArmedInstance.cpp @@ -136,11 +136,11 @@ CBonusSystemNode * CArmedInstance::whatShouldBeAttached() void CArmedInstance::writeJsonOptions(JsonNode& json) const { CGObjectInstance::writeJsonOptions(json); - CCreatureSet::writeJson(json); + CCreatureSet::writeJson(json["army"]); } void CArmedInstance::readJsonOptions(const JsonNode& json) { CGObjectInstance::readJsonOptions(json); - CCreatureSet::readJson(json); + CCreatureSet::readJson(json["army"]); } diff --git a/lib/mapObjects/CObjectHandler.cpp b/lib/mapObjects/CObjectHandler.cpp index 66e2ae168..d61bcd39f 100644 --- a/lib/mapObjects/CObjectHandler.cpp +++ b/lib/mapObjects/CObjectHandler.cpp @@ -352,9 +352,10 @@ void CGObjectInstance::readJson(const JsonNode & json) pos.z = json["l"].Float(); 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