mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
Merge pull request #6423 from kdmcser/only_commander_left_crash
Fix crash when losing battle vs neutral creatures (null winnerHero commander)
This commit is contained in:
@@ -416,8 +416,7 @@ void BattleResultProcessor::battleFinalize(const BattleID & battleID, const Batt
|
||||
{
|
||||
winnerHero = (*battle)->battleGetFightingHero(finishingBattle->winnerSide);
|
||||
loserHero = (*battle)->battleGetFightingHero(CBattleInfoEssentials::otherSide(finishingBattle->winnerSide));
|
||||
auto commander = winnerHero->getCommander();
|
||||
winnerHasUnitsLeft = winnerHero ? winnerHero->stacksCount() > 0 || (commander && commander->alive) : true;
|
||||
winnerHasUnitsLeft = winnerHero ? winnerHero->stacksCount() > 0 || (winnerHero->getCommander() && winnerHero->getCommander()->alive) : true;
|
||||
}
|
||||
|
||||
BattleResultsApplied resultsApplied;
|
||||
|
||||
Reference in New Issue
Block a user