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

Fix crash on losing a hero

Browse Source
This commit is contained in:
Ivan Savenko 2024-10-10 21:16:41 +00:00
parent 1fc0267ad1
commit dfff1eae26
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/PlayerLocalState.cpp
View File

@ -219,7 +219,12 @@ void PlayerLocalState::removeWanderingHero(const CGHeroInstance * hero)
if (hero == currentSelection) if (hero == currentSelection)
{ {
auto const * nextHero = getNextWanderingHero(hero); auto const * nextHero = getNextWanderingHero(hero);
if (nextHero)
setSelection(nextHero); setSelection(nextHero);
else if (!ownedTowns.empty())
setSelection(ownedTowns.front());
else
setSelection(nullptr);
} }
vstd::erase(wanderingHeroes, hero); vstd::erase(wanderingHeroes, hero);
@ -334,6 +339,7 @@ void PlayerLocalState::serialize(JsonNode & dest) const
dest["spellbook"]["tabBattle"].Integer() = spellbookSettings.spellbookLastTabBattle; dest["spellbook"]["tabBattle"].Integer() = spellbookSettings.spellbookLastTabBattle;
dest["spellbook"]["tabAdvmap"].Integer() = spellbookSettings.spellbookLastTabAdvmap; dest["spellbook"]["tabAdvmap"].Integer() = spellbookSettings.spellbookLastTabAdvmap;
if (currentSelection)
dest["currentSelection"].Integer() = currentSelection->id; dest["currentSelection"].Integer() = currentSelection->id;
} }