games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Fix crash during auto battle

Browse Source
This commit is contained in:
edeksumo 2015-11-24 20:55:11 +01:00
parent ba1062ed3c
commit aab5a05036
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/NetPacksLib.cpp
View File

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