games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #2085 from Nordsoft91/mapeditor-fix

Browse Source 
[1.2.1] Fix portrait serialization
This commit is contained in:
Ivan Savenko
2023-04-28 17:06:29 +03:00
committed by GitHub
parent 9296306fa3 f6d91cab35
commit 3ae4819fcb
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -1469,7 +1469,12 @@ void CGHeroInstance::serializeCommonOptions(JsonSerializeFormat & handler)
if(portrait >= 0) if(portrait >= 0)
{ {
if(portrait < legacyHeroes || portrait >= moddedStart) if(portrait < legacyHeroes || portrait >= moddedStart)
handler.serializeId<si32, si32, HeroTypeID>("portrait", portrait, -1); {
int tempPortrait = portrait >= moddedStart
? portrait - GameConstants::HERO_PORTRAIT_SHIFT
: portrait;
handler.serializeId<si32, si32, HeroTypeID>("portrait", tempPortrait, -1);
}
else else
handler.serializeInt("portrait", portrait, -1); handler.serializeInt("portrait", portrait, -1);
} }
@@ -1479,7 +1484,11 @@ void CGHeroInstance::serializeCommonOptions(JsonSerializeFormat & handler)
const JsonNode & portraitNode = handler.getCurrent()["portrait"]; const JsonNode & portraitNode = handler.getCurrent()["portrait"];
if(portraitNode.getType() == JsonNode::JsonType::DATA_STRING) if(portraitNode.getType() == JsonNode::JsonType::DATA_STRING)
{
handler.serializeId<si32, si32, HeroTypeID>("portrait", portrait, -1); handler.serializeId<si32, si32, HeroTypeID>("portrait", portrait, -1);
if(portrait >= legacyHeroes)
portrait += GameConstants::HERO_PORTRAIT_SHIFT;
}
else else
handler.serializeInt("portrait", portrait, -1); handler.serializeInt("portrait", portrait, -1);
} }