diff --git a/lib/CHeroHandler.h b/lib/CHeroHandler.h index 014ca0fb1..7da6624e3 100644 --- a/lib/CHeroHandler.h +++ b/lib/CHeroHandler.h @@ -120,7 +120,7 @@ public: template void serialize(Handler &h, const int version) { - h & identifier & name & faction;// & aggression; + h & identifier & name & faction & id;// & aggression; h & primarySkillInitial & primarySkillLowLevel; h & primarySkillHighLevel & secSkillProbability; h & selectionProbability; diff --git a/lib/CTownHandler.cpp b/lib/CTownHandler.cpp index 7e7306c52..a55ee9dbf 100644 --- a/lib/CTownHandler.cpp +++ b/lib/CTownHandler.cpp @@ -58,7 +58,7 @@ si32 CBuilding::getDistance(BuildingID buildID) const CFaction::CFaction() { - + town = nullptr; } CFaction::~CFaction() diff --git a/lib/CTownHandler.h b/lib/CTownHandler.h index 7ea360131..66d8d3a96 100644 --- a/lib/CTownHandler.h +++ b/lib/CTownHandler.h @@ -119,7 +119,7 @@ public: template void serialize(Handler &h, const int version) { - h & name & index & nativeTerrain & creatureBg120 & creatureBg130 & puzzleMap; + h & name & index & nativeTerrain & alignment & commander & town & creatureBg120 & creatureBg130 & puzzleMap; } }; @@ -142,7 +142,7 @@ public: std::vector dwellings; //defs for adventure map dwellings for new towns, [0] means tier 1 creatures etc. std::vector dwellingNames; - // should be removed at least from configs in favour of auto-detection + // should be removed at least from configs in favor of auto-detection std::map hordeLvl; //[0] - first horde building creature level; [1] - second horde building (-1 if not present) ui32 mageLevel; //max available mage guild level ui16 primaryRes;