games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-08 23:22:25 +02:00
Code Issues Releases Activity

Merge pull request #6204 from Laserlicht/res_fix

Browse Source 
fix deserializion of ResourceSet for compatibility
This commit is contained in:
Ivan Savenko
2025-10-04 14:57:44 +03:00
committed by GitHub
parent 1c819edc32 967283beb6
commit 3094143772
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ResourceSet.h
View File

@@ -214,7 +214,25 @@ public:
template <typename Handler> void serialize(Handler &h) template <typename Handler> void serialize(Handler &h)
{ {
h & container; if (h.version >= Handler::Version::CONFIGURABLE_RESOURCES)
h & container;
else
{
if (h.saving)
{
std::array<TResource, 8> tmp = {};
for (size_t i = 0; i < 7; ++i)
tmp[i] = container[i];
tmp[7] = TResource{};
h & tmp;
}
else
{
std::array<TResource, 8> tmp = {};
h & tmp;
container = std::vector<TResource>(tmp.begin(), tmp.begin() + 7);
}
}
} }
DLL_LINKAGE void serializeJson(JsonSerializeFormat & handler, const std::string & fieldName); DLL_LINKAGE void serializeJson(JsonSerializeFormat & handler, const std::string & fieldName);

3
lib/serializer/ESerializationVersion.h
View File

@@ -49,8 +49,9 @@ enum class ESerializationVersion : int32_t
CAMPAIGN_BONUSES, // new format for scenario bonuses in campaigns CAMPAIGN_BONUSES, // new format for scenario bonuses in campaigns
BONUS_HIDDEN, // hidden bonus BONUS_HIDDEN, // hidden bonus
MORE_MAP_LAYERS, // more map layers MORE_MAP_LAYERS, // more map layers
CONFIGURABLE_RESOURCES, // configurable resources
CURRENT = MORE_MAP_LAYERS, CURRENT = CONFIGURABLE_RESOURCES,
}; };
static_assert(ESerializationVersion::MINIMAL <= ESerializationVersion::CURRENT, "Invalid serialization version definition!"); static_assert(ESerializationVersion::MINIMAL <= ESerializationVersion::CURRENT, "Invalid serialization version definition!");