post-merge fixes

lib/CArtHandler.h

@@ -80,7 +80,7 @@ public:
 		h & static_cast<CBonusSystemNode&>(*this);
 		h & name & description & eventText & image & large & advMapDef & iconIndex &
 			price & possibleSlots & constituents & constituentOf & aClass & id;
-		if(version>=755)
+		if(version>=756)
 		{
 			h & identifier;
 		}

lib/CCreatureHandler.h

@@ -138,7 +138,7 @@ public:
 		h & idNumber & faction & sounds & animation;
 
 		h & doubleWide & special;
-		if(version>=755)
+		if(version>=756)
 		{
 			h & identifier;
 		}		

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;
 		}		

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;

lib/mapObjects/CObjectClassesHandler.h

@@ -159,7 +159,7 @@ public:
 	template <typename Handler> 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 <typename Handler> void serialize(Handler &h, const int version)
 		{
 			h & name & handlerName & base & subObjects;
-			if(version >= 755)
+			if(version >= 756)
 			{
 				h & identifier & subIds;
 			}

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;
 		}

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<CGHeroInstance*>(instance));
+		owner->map->heroesOnMap.push_back(static_cast<CGHeroInstance *>(instance));
 	}
 }