games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Fixed crash on battle end — don't attempt giving exp to loser (hero is removed -> can't get exp -> crash).

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2013-08-18 17:49:31 +00:00
parent 3b42cff3ec
commit 38c1542d9d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/CGameHandler.cpp
View File

@ -628,9 +628,9 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
} }
//give exp //give exp
if (battleResult.data->exp[0] && hero1) if (battleResult.data->exp[0] && hero1 && battleResult.get()->winner == 0)
changePrimSkill(hero1, PrimarySkill::EXPERIENCE, battleResult.data->exp[0]); changePrimSkill(hero1, PrimarySkill::EXPERIENCE, battleResult.data->exp[0]);
else if (battleResult.data->exp[1] && hero2) else if (battleResult.data->exp[1] && hero2 && battleResult.get()->winner == 1)
changePrimSkill(hero2, PrimarySkill::EXPERIENCE, battleResult.data->exp[1]); changePrimSkill(hero2, PrimarySkill::EXPERIENCE, battleResult.data->exp[1]);
queries.popIfTop(battleQuery); queries.popIfTop(battleQuery);
@ -3536,6 +3536,8 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
StartAction start_action(ba); StartAction start_action(ba);
sendAndApply(&start_action); sendAndApply(&start_action);
auto makeScopeGuard([&]{ sendAndApply(&end_action); }); //if we started than we have to finish
const CGHeroInstance * attackingHero = gs->curB->battleGetFightingHero(ba.side); const CGHeroInstance * attackingHero = gs->curB->battleGetFightingHero(ba.side);
CHeroHandler::SBallisticsLevelInfo sbi = VLC->heroh->ballistics[attackingHero->getSecSkillLevel(SecondarySkill::BALLISTICS)]; CHeroHandler::SBallisticsLevelInfo sbi = VLC->heroh->ballistics[attackingHero->getSecSkillLevel(SecondarySkill::BALLISTICS)];
@ -3547,11 +3549,13 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
} }
//in successive iterations damage is dealt but not yet subtracted from wall's HPs //in successive iterations damage is dealt but not yet subtracted from wall's HPs
auto currentHP = gs->curB->si.wallState; auto &currentHP = gs->curB->si.wallState;
if (currentHP[desiredTarget] != EWallState::DESTROYED && if (currentHP[desiredTarget] == EWallState::DESTROYED || currentHP[desiredTarget] == EWallState::NONE)
currentHP[desiredTarget] != EWallState::NONE) {
desiredTarget = EWallParts::INVALID; complain("catapult tried to attack already destroyed wall part!");
break;
}
for(int g=0; g<sbi.shots; ++g) for(int g=0; g<sbi.shots; ++g)
{ {
@ -3649,7 +3653,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
sendAndApply(&ca); sendAndApply(&ca);
} }
sendAndApply(&end_action); //finish by scope guard
break; break;
} }
case Battle::STACK_HEAL: //healing with First Aid Tent case Battle::STACK_HEAL: //healing with First Aid Tent