games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge master -> develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-28 22:57:25 +03:00
parent 346b8a4619 f26ff594b8
commit d985ac90d3
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -1478,7 +1478,9 @@ void CGHeroInstance::serializeCommonOptions(JsonSerializeFormat & handler)
{
if(portrait < legacyHeroes || portrait >= moddedStart)
{
int tempPortrait = portrait - GameConstants::HERO_PORTRAIT_SHIFT;
int tempPortrait = portrait >= moddedStart
? portrait - GameConstants::HERO_PORTRAIT_SHIFT
: portrait;
handler.serializeId<si32, si32, HeroTypeID>("portrait", tempPortrait, -1);
}
else
@@ -1492,7 +1494,8 @@ void CGHeroInstance::serializeCommonOptions(JsonSerializeFormat & handler)
if(portraitNode.getType() == JsonNode::JsonType::DATA_STRING)
{
handler.serializeId<si32, si32, HeroTypeID>("portrait", portrait, -1);
portrait += GameConstants::HERO_PORTRAIT_SHIFT;
if(portrait >= legacyHeroes)
portrait += GameConstants::HERO_PORTRAIT_SHIFT;
}
else
handler.serializeInt("portrait", portrait, -1);