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

Fixed crash on ending battle with a draw

Browse Source
This commit is contained in:
Ivan Savenko
2023-07-22 22:04:12 +03:00
parent a912770e29
commit 5aa2492a90
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/NetPacksLib.cpp
View File

@ -2205,25 +2205,31 @@ void BattleResultAccepted::applyGs(CGameState * gs) const
for(auto & res : heroResult) for(auto & res : heroResult)
{ {
if(res.hero) if(res.hero)
res.hero->removeBonusesRecursive(Bonus::OneBattle); res.hero->removeBonusesRecursive(Bonus::OneBattle);
} }
// Grow up growing artifacts if(winnerSide != 2)
if(const auto hero = heroResult[winnerSide].hero) {
{ // Grow up growing artifacts
if(hero->commander && hero->commander->alive) const auto hero = heroResult[winnerSide].hero;
{
for(auto & art : hero->commander->artifactsWorn) if (hero)
art.second.artifact->growingUp(); {
} if(hero->commander && hero->commander->alive)
for(auto & art : hero->artifactsWorn) {
{ for(auto & art : hero->commander->artifactsWorn)
art.second.artifact->growingUp(); art.second.artifact->growingUp();
} }
} for(auto & art : hero->artifactsWorn)
if(VLC->settings()->getBoolean(EGameSettings::MODULE_STACK_EXPERIENCE)) {
{ art.second.artifact->growingUp();
if(heroResult[0].army) }
}
}
if(VLC->settings()->getBoolean(EGameSettings::MODULE_STACK_EXPERIENCE))
{
if(heroResult[0].army)
heroResult[0].army->giveStackExp(heroResult[0].exp); heroResult[0].army->giveStackExp(heroResult[0].exp);
if(heroResult[1].army) if(heroResult[1].army)
heroResult[1].army->giveStackExp(heroResult[1].exp); heroResult[1].army->giveStackExp(heroResult[1].exp);