games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Restore save compatibility with 1.5

Browse Source
This commit is contained in:
Ivan Savenko 2024-11-07 12:08:08 +00:00
parent b9ff192a91
commit c3c5f73a63
4 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/bonuses/Limiters.h
View File

@ -108,7 +108,16 @@ public:
template <typename Handler> void serialize(Handler &h) template <typename Handler> void serialize(Handler &h)
{ {
h & static_cast<ILimiter&>(*this); h & static_cast<ILimiter&>(*this);
h & creatureID;
if (h.version < Handler::Version::REMOVE_TOWN_PTR)
{
bool isNull = false;
h & isNull;
if(!isNull)
h & creatureID;
}
else
h & creatureID;
h & includeUpgrades; h & includeUpgrades;
} }
}; };

19
lib/mapObjects/CGMarket.h
View File

@ -78,7 +78,24 @@ public:
template <typename Handler> void serialize(Handler &h) template <typename Handler> void serialize(Handler &h)
{ {
h & static_cast<CGMarket&>(*this); h & static_cast<CGMarket&>(*this);
h & artifacts; if (h.version < Handler::Version::REMOVE_VLC_POINTERS)
{
int32_t size = 0;
h & size;
for (int32_t i = 0; i < size; ++i)
{
bool isNull = false;
ArtifactID artifact;
h & isNull;
if (!isNull)
h & artifact;
artifacts.push_back(artifact);
}
}
else
{
h & artifacts;
}
} }
}; };

20
lib/mapping/CMap.h
View File

@ -222,7 +222,25 @@ public:
// static members // static members
h & obeliskCount; h & obeliskCount;
h & obelisksVisited; h & obelisksVisited;
h & townMerchantArtifacts;
if (h.version < Handler::Version::REMOVE_VLC_POINTERS)
{
int32_t size = 0;
h & size;
for (int32_t i = 0; i < size; ++i)
{
bool isNull = false;
ArtifactID artifact;
h & isNull;
if (!isNull)
h & artifact;
townMerchantArtifacts.push_back(artifact);
}
}
else
{
h & townMerchantArtifacts;
}
h & townUniversitySkills; h & townUniversitySkills;
h & instanceNames; h & instanceNames;

7
lib/mapping/CMapDefines.h
View File

@ -146,10 +146,9 @@ struct DLL_LINKAGE TerrainTile
{ {
bool isNull = false; bool isNull = false;
h & isNull; h & isNull;
if (isNull) if (!isNull)
h & terrainType; h & terrainType;
} }
h & terrainType;
h & terView; h & terView;
if (h.version >= Handler::Version::REMOVE_VLC_POINTERS) if (h.version >= Handler::Version::REMOVE_VLC_POINTERS)
{ {
@ -159,7 +158,7 @@ struct DLL_LINKAGE TerrainTile
{ {
bool isNull = false; bool isNull = false;
h & isNull; h & isNull;
if (isNull) if (!isNull)
h & riverType; h & riverType;
} }
h & riverDir; h & riverDir;
@ -171,7 +170,7 @@ struct DLL_LINKAGE TerrainTile
{ {
bool isNull = false; bool isNull = false;
h & isNull; h & isNull;
if (isNull) if (!isNull)
h & roadType; h & roadType;
} }
h & roadDir; h & roadDir;