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

More correct usage of battleGetFightingHero

Browse Source 
* this should fix "FIXME: battleGetFightingHero wrong argument!"
This commit is contained in:
AlexVinS
2015-09-16 18:28:14 +03:00
parent 92990c887c
commit 6010bbe7ba
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@@ -4183,17 +4183,17 @@ void CGameHandler::stackTurnTrigger(const CStack * st)
}
if (st->hasBonusOfType(Bonus::MANA_DRAIN) && !vstd::contains(st->state, EBattleStackState::DRAINED_MANA))
{
const CGHeroInstance * enemy = gs->curB->getHero(gs->curB->theOtherPlayer(st->owner));
//const CGHeroInstance * owner = gs->curB->getHero(st->owner);
if (enemy)
const PlayerColor opponent = gs->curB->theOtherPlayer(st->owner);
const CGHeroInstance * opponentHero = gs->curB->getHero(opponent);
if (opponentHero)
{
ui32 manaDrained = st->valOfBonuses(Bonus::MANA_DRAIN);
vstd::amin(manaDrained, gs->curB->battleGetFightingHero(0)->mana);
vstd::amin(manaDrained, opponentHero->mana);
if (manaDrained)
{
bte.effect = Bonus::MANA_DRAIN;
bte.val = manaDrained;
bte.additionalInfo = enemy->id.getNum(); //for sanity
bte.additionalInfo = opponentHero->id.getNum(); //for sanity
sendAndApply(&bte);
}
}