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

Block surrender via escape tunnel. Fix issue 2389

Browse Source
This commit is contained in:
Dydzio 2016-09-18 22:05:05 +02:00 committed by GitHub
parent 1d45d214e5
commit 8b0c62e10e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CBattleCallback.cpp
View File

@ -425,8 +425,10 @@ ui8 CBattleInfoEssentials::battleGetSiegeLevel() const
bool CBattleInfoEssentials::battleCanSurrender(PlayerColor player) const
{
RETURN_IF_NOT_BATTLE(false);
//conditions like for fleeing + enemy must have a hero
return battleCanFlee(player) && battleHasHero(!playerToSide(player));
ui8 mySide = playerToSide(player);
bool iAmSiegeDefender = ( mySide == BattleSide::DEFENDER && battleGetSiegeLevel() );
//conditions like for fleeing (except escape tunnel presence) + enemy must have a hero
return battleCanFlee(player) && !iAmSiegeDefender && battleHasHero(!mySide);
}
bool CBattleInfoEssentials::battleHasHero(ui8 side) const