diff --git a/lib/CArtHandler.h b/lib/CArtHandler.h index f9d860a2c..08317b75c 100644 --- a/lib/CArtHandler.h +++ b/lib/CArtHandler.h @@ -80,7 +80,7 @@ public: h & static_cast(*this); h & name & description & eventText & image & large & advMapDef & iconIndex & price & possibleSlots & constituents & constituentOf & aClass & id; - if(version>=755) + if(version>=756) { h & identifier; } diff --git a/lib/CCreatureHandler.h b/lib/CCreatureHandler.h index b78753f5d..23c480595 100644 --- a/lib/CCreatureHandler.h +++ b/lib/CCreatureHandler.h @@ -138,7 +138,7 @@ public: h & idNumber & faction & sounds & animation; h & doubleWide & special; - if(version>=755) + if(version>=756) { h & identifier; } diff --git a/lib/CHeroHandler.h b/lib/CHeroHandler.h index b0c22a4c6..ef037e9fd 100644 --- a/lib/CHeroHandler.h +++ b/lib/CHeroHandler.h @@ -92,7 +92,7 @@ public: h & ID & imageIndex & initialArmy & heroClass & secSkillsInit & spec & specialty & spells & haveSpellBook & sex & special; h & name & biography & specName & specDescr & specTooltip; h & iconSpecSmall & iconSpecLarge & portraitSmall & portraitLarge; - if(version>=755) + if(version>=756) { h & identifier; } diff --git a/lib/Connection.h b/lib/Connection.h index 07c724af1..1af06160b 100644 --- a/lib/Connection.h +++ b/lib/Connection.h @@ -27,7 +27,7 @@ #include "mapping/CCampaignHandler.h" //for CCampaignState #include "rmg/CMapGenerator.h" // for CMapGenOptions -const ui32 version = 755; +const ui32 version = 756; const ui32 minSupportedVersion = 753; class CISer; diff --git a/lib/mapObjects/CObjectClassesHandler.h b/lib/mapObjects/CObjectClassesHandler.h index eb3413239..6e88fdb7c 100644 --- a/lib/mapObjects/CObjectClassesHandler.h +++ b/lib/mapObjects/CObjectClassesHandler.h @@ -159,7 +159,7 @@ public: template void serialize(Handler &h, const int version) { h & type & subtype & templates & rmgInfo & objectName; - if(version >= 755) + if(version >= 756) { h & typeName & subTypeName; } @@ -186,7 +186,7 @@ class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase template void serialize(Handler &h, const int version) { h & name & handlerName & base & subObjects; - if(version >= 755) + if(version >= 756) { h & identifier & subIds; } diff --git a/lib/mapObjects/CObjectHandler.h b/lib/mapObjects/CObjectHandler.h index 114babff8..e4f89cc63 100644 --- a/lib/mapObjects/CObjectHandler.h +++ b/lib/mapObjects/CObjectHandler.h @@ -179,7 +179,7 @@ public: h & pos & ID & subID & id & tempOwner & blockVisit & appearance; //definfo is handled by map serializer - if(version >= 755) + if(version >= 756) { h & typeName & subTypeName; } diff --git a/lib/mapping/MapFormatJson.cpp b/lib/mapping/MapFormatJson.cpp index a9e0f8d5a..155f14dec 100644 --- a/lib/mapping/MapFormatJson.cpp +++ b/lib/mapping/MapFormatJson.cpp @@ -21,6 +21,9 @@ #include "../mapObjects/ObjectTemplate.h" #include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectClassesHandler.h" +#include "../mapObjects/CGHeroInstance.h" +#include "../mapObjects/CGTownInstance.h" + #include "../StringConstants.h" namespace TriggeredEventsDetail @@ -606,7 +609,7 @@ void CMapLoaderJson::MapObjectLoader::configure() if(instance->ID == Obj::HERO) { logGlobal->debugStream() << "Hero: " << VLC->heroh->heroes[instance->subID]->name << " at " << instance->pos; - owner->map->heroesOnMap.push_back(static_cast(instance)); + owner->map->heroesOnMap.push_back(static_cast(instance)); } }