games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Merge fixes

Browse Source
This commit is contained in:
AlexVinS
2016-02-04 12:28:12 +03:00
parent 6e205a58b4
commit 483276b128
10 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CObjectClassesHandler.h
View File

@@ -159,7 +159,7 @@ public:
template <typename Handler> void serialize(Handler &h, const int version)
{
h & type & subtype & templates & rmgInfo & objectName;
if(version >= 756)
if(version >= 759)
{
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 >= 756)
if(version >= 759)
{
h & identifier & subIds;
}

2
lib/mapObjects/CObjectHandler.h
View File

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