Formating2

Change ani to anim

client/battle/CBattleAnimations.cpp

@@ -233,7 +233,7 @@ std::string CDefenceAnimation::getMySound()
 	if(killed)
 		return battle_sound(stack->getCreature(), killed);
 
-	if (vstd::contains(stack->state, EBattleStackState::DEFENDING_ANI))
+	if (vstd::contains(stack->state, EBattleStackState::DEFENDING_ANIM))
 		return battle_sound(stack->getCreature(), defend);
 
 	return battle_sound(stack->getCreature(), wince);
@@ -244,7 +244,7 @@ CCreatureAnim::EAnimType CDefenceAnimation::getMyAnimType()
 	if(killed)
 		return CCreatureAnim::DEATH;
 	
-	if (vstd::contains(stack->state, EBattleStackState::DEFENDING_ANI))
+	if (vstd::contains(stack->state, EBattleStackState::DEFENDING_ANIM))
 		return CCreatureAnim::DEFENCE;
 
 	return CCreatureAnim::HITTED;

lib/GameConstants.h

@@ -445,7 +445,7 @@ namespace EBattleStackState
 		//remember to drain mana only once per turn
 		DRAINED_MANA,
 		//only for defending animation
-		DEFENDING_ANI
+		DEFENDING_ANIM
 	};
 }
 

lib/NetPacksLib.cpp

@@ -1304,8 +1304,8 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
 {
 	CStack *st = gs->curB->getStack(ba.stackNumber);
 
-	if(vstd::contains(st->state, EBattleStackState::DEFENDING_ANI))
-		st->state -= EBattleStackState::DEFENDING_ANI;
+	if(vstd::contains(st->state, EBattleStackState::DEFENDING_ANIM))
+		st->state -= EBattleStackState::DEFENDING_ANIM;
 
 	if(ba.actionType == Battle::END_TACTIC_PHASE)
 	{
@@ -1333,7 +1333,7 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
 	{
 	case Battle::DEFEND:
 		st->state.insert(EBattleStackState::DEFENDING);
-		st->state.insert(EBattleStackState::DEFENDING_ANI);
+		st->state.insert(EBattleStackState::DEFENDING_ANIM);
 		break;
 	case Battle::WAIT:
 		st->state.insert(EBattleStackState::WAITING);