Browse Source

Formatting

edeksumo 10 năm trước cách đây
mục cha
commit
dd525da153
3 tập tin đã thay đổi với 18 bổ sung3 xóa
  1. 2 0
      client/battle/CBattleAnimations.cpp
  2. 15 2
      lib/GameConstants.h
  3. 1 1
      lib/NetPacksLib.cpp

+ 2 - 0
client/battle/CBattleAnimations.cpp

@@ -235,6 +235,7 @@ std::string CDefenceAnimation::getMySound()
 
 	if (vstd::contains(stack->state, EBattleStackState::DEFENDING_ANI))
 		return battle_sound(stack->getCreature(), defend);
+
 	return battle_sound(stack->getCreature(), wince);
 }
 
@@ -245,6 +246,7 @@ CCreatureAnim::EAnimType CDefenceAnimation::getMyAnimType()
 	
 	if (vstd::contains(stack->state, EBattleStackState::DEFENDING_ANI))
 		return CCreatureAnim::DEFENCE;
+
 	return CCreatureAnim::HITTED;
 }
 

+ 15 - 2
lib/GameConstants.h

@@ -432,8 +432,21 @@ namespace EMarketMode
 
 namespace EBattleStackState
 {
-	enum EBattleStackState{ALIVE = 180, SUMMONED, CLONED, DEAD_CLONE, HAD_MORALE, WAITING, MOVED, DEFENDING, FEAR,
-		DRAINED_MANA /*remember to drain mana only once per turn*/, DEFENDING_ANI/*only for animation*/};
+	enum EBattleStackState
+	{
+		ALIVE = 180,
+		SUMMONED, CLONED,
+		DEAD_CLONE,
+		HAD_MORALE,
+		WAITING,
+		MOVED,
+		DEFENDING,
+		FEAR,
+		//remember to drain mana only once per turn
+		DRAINED_MANA,
+		//only for defending animation
+		DEFENDING_ANI
+	};
 }
 
 namespace ECommander

+ 1 - 1
lib/NetPacksLib.cpp

@@ -1332,7 +1332,7 @@ DLL_LINKAGE void StartAction::applyGs( CGameState *gs )
 	switch(ba.actionType)
 	{
 	case Battle::DEFEND:
-		st->state.insert(EBattleStackState::DEFENDING);	
+		st->state.insert(EBattleStackState::DEFENDING);
 		st->state.insert(EBattleStackState::DEFENDING_ANI);
 		break;
 	case Battle::WAIT: