AlexVinS 10 gadi atpakaļ
vecāks
revīzija
b0c4ea5947

+ 2 - 2
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"]);
 }

+ 3 - 2
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