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

Merge pull request #142 from edeksumo/Fix-Defence-Ani

Browse Source 
Fix crash
This commit is contained in:
DjWarmonger
2015-11-24 21:37:32 +01:00
parent 0b9a9ab26d aab5a05036
commit 45d183289d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/NetPacksLib.cpp
View File

@@ -1306,9 +1306,6 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
{
CStack *st = gs->curB->getStack(ba.stackNumber);
if(vstd::contains(st->state, EBattleStackState::DEFENDING_ANIM))
st->state -= EBattleStackState::DEFENDING_ANIM;
if(ba.actionType == Battle::END_TACTIC_PHASE)
{
gs->curB->tacticDistance = 0;
@@ -1334,15 +1331,18 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
switch(ba.actionType)
{
case Battle::DEFEND:
st->state -= EBattleStackState::DEFENDING_ANIM;
st->state.insert(EBattleStackState::DEFENDING);
st->state.insert(EBattleStackState::DEFENDING_ANIM);
break;
case Battle::WAIT:
st->state -= EBattleStackState::DEFENDING_ANIM;
st->state.insert(EBattleStackState::WAITING);
return;
case Battle::HERO_SPELL: //no change in current stack state
return;
default: //any active stack action - attack, catapult, heal, spell...
st->state -= EBattleStackState::DEFENDING_ANIM;
st->state.insert(EBattleStackState::MOVED);
break;
}