games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

post-merge fixes

Browse Source
This commit is contained in:
AlexVinS
2015-12-05 13:56:38 +03:00
parent 947edc0693
commit f33bcee84c
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CArtHandler.h
View File

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

2
lib/CCreatureHandler.h
View File

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

2
lib/CHeroHandler.h
View File

@@ -92,7 +92,7 @@ public:
h & ID & imageIndex & initialArmy & heroClass & secSkillsInit & spec & specialty & spells & haveSpellBook & sex & special; h & ID & imageIndex & initialArmy & heroClass & secSkillsInit & spec & specialty & spells & haveSpellBook & sex & special;
h & name & biography & specName & specDescr & specTooltip; h & name & biography & specName & specDescr & specTooltip;
h & iconSpecSmall & iconSpecLarge & portraitSmall & portraitLarge; h & iconSpecSmall & iconSpecLarge & portraitSmall & portraitLarge;
if(version>=755) if(version>=756)
{ {
h & identifier; h & identifier;
} }

2
lib/Connection.h
View File

@@ -27,7 +27,7 @@
#include "mapping/CCampaignHandler.h" //for CCampaignState #include "mapping/CCampaignHandler.h" //for CCampaignState
#include "rmg/CMapGenerator.h" // for CMapGenOptions #include "rmg/CMapGenerator.h" // for CMapGenOptions
const ui32 version = 755; const ui32 version = 756;
const ui32 minSupportedVersion = 753; const ui32 minSupportedVersion = 753;
class CISer; class CISer;

4
lib/mapObjects/CObjectClassesHandler.h
View File

@@ -159,7 +159,7 @@ public:
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & type & subtype & templates & rmgInfo & objectName; h & type & subtype & templates & rmgInfo & objectName;
if(version >= 755) if(version >= 756)
{ {
h & typeName & subTypeName; h & typeName & subTypeName;
} }
@@ -186,7 +186,7 @@ class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & name & handlerName & base & subObjects; h & name & handlerName & base & subObjects;
if(version >= 755) if(version >= 756)
{ {
h & identifier & subIds; h & identifier & subIds;
} }

2
lib/mapObjects/CObjectHandler.h
View File

@@ -179,7 +179,7 @@ public:
h & pos & ID & subID & id & tempOwner & blockVisit & appearance; h & pos & ID & subID & id & tempOwner & blockVisit & appearance;
//definfo is handled by map serializer //definfo is handled by map serializer
if(version >= 755) if(version >= 756)
{ {
h & typeName & subTypeName; h & typeName & subTypeName;
} }

5
lib/mapping/MapFormatJson.cpp
View File

@@ -21,6 +21,9 @@
#include "../mapObjects/ObjectTemplate.h" #include "../mapObjects/ObjectTemplate.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../mapObjects/CObjectClassesHandler.h" #include "../mapObjects/CObjectClassesHandler.h"
#include "../mapObjects/CGHeroInstance.h"
#include "../mapObjects/CGTownInstance.h"
#include "../StringConstants.h" #include "../StringConstants.h"
namespace TriggeredEventsDetail namespace TriggeredEventsDetail
@@ -606,7 +609,7 @@ void CMapLoaderJson::MapObjectLoader::configure()
if(instance->ID == Obj::HERO) if(instance->ID == Obj::HERO)
{ {
logGlobal->debugStream() << "Hero: " << VLC->heroh->heroes[instance->subID]->name << " at " << instance->pos; 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));
} }
} }