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

Remove UNTIL_BEING_ATTACKED bonuses after any received damage.

Browse Source 
* fixes http://bugs.vcmi.eu/view.php?id=2528
This commit is contained in:
AlexVinS 2016-09-30 02:09:02 +03:00
parent 245d17a9e9
commit 887794e88b
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/NetPacksLib.cpp
View File

@ -1370,6 +1370,7 @@ DLL_LINKAGE void BattleStackAttacked::applyGs( CGameState *gs )
{ {
CStack * at = gs->curB->getStack(stackAttacked); CStack * at = gs->curB->getStack(stackAttacked);
assert(at); assert(at);
at->popBonuses(Bonus::UntilBeingAttacked);
at->count = newAmount; at->count = newAmount;
at->firstHPleft = newHP; at->firstHPleft = newHP;
@ -1440,17 +1441,10 @@ DLL_LINKAGE void BattleAttack::applyGs( CGameState *gs )
attacker->shots--; attacker->shots--;
} }
} }
for(BattleStackAttacked stackAttacked : bsa) for(BattleStackAttacked & stackAttacked : bsa)
stackAttacked.applyGs(gs); stackAttacked.applyGs(gs);
attacker->popBonuses(Bonus::UntilAttack); attacker->popBonuses(Bonus::UntilAttack);
for(auto & elem : bsa)
{
CStack * stack = gs->curB->getStack(elem.stackAttacked, false);
if (stack) //cloned stack is already gone
stack->popBonuses(Bonus::UntilBeingAttacked);
}
} }
DLL_LINKAGE void StartAction::applyGs( CGameState *gs ) DLL_LINKAGE void StartAction::applyGs( CGameState *gs )