games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

* JsonReader can convert to enums

Browse Source 
* refactoring
This commit is contained in:
mateuszb
2013-02-03 21:05:44 +00:00
parent 1fca96257d
commit 8769f67c5d
38 changed files with 312 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/NetPacksLib.cpp
View File

@ -1180,7 +1180,7 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
{
CStack *st = gs->curB->getStack(ba.stackNumber);
if(ba.actionType == BattleAction::END_TACTIC_PHASE)
if(ba.actionType == Battle::END_TACTIC_PHASE)
{
gs->curB->tacticDistance = 0;
return;
@ -1193,7 +1193,7 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
return;
}
if(ba.actionType != BattleAction::HERO_SPELL) //don't check for stack if it's custom action by hero
if(ba.actionType != Battle::HERO_SPELL) //don't check for stack if it's custom action by hero
{
assert(st);
}
@ -1204,13 +1204,13 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
switch(ba.actionType)
{
case BattleAction::DEFEND:
case Battle::DEFEND:
st->state.insert(EBattleStackState::DEFENDING);
break;
case BattleAction::WAIT:
case Battle::WAIT:
st->state.insert(EBattleStackState::WAITING);
return;
case BattleAction::HERO_SPELL: //no change in current stack state
case Battle::HERO_SPELL: //no change in current stack state
return;
default: //any active stack action - attack, catapult, heal, spell...
st->state.insert(EBattleStackState::MOVED);