From 34ef79d15e06309cd8301916edb62585d2b20bdd Mon Sep 17 00:00:00 2001 From: mateuszb Date: Fri, 11 Sep 2009 13:18:20 +0000 Subject: [PATCH] * minor improvements --- client/CBattleInterface.cpp | 4 +++- client/CBattleInterface.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/CBattleInterface.cpp b/client/CBattleInterface.cpp index 806757e6f..485e8b198 100644 --- a/client/CBattleInterface.cpp +++ b/client/CBattleInterface.cpp @@ -689,7 +689,7 @@ bool CBattleAttack::checkInitialConditions() } CBattleAttack::CBattleAttack(CBattleInterface * _owner, int _stackID) -: CBattleStackAnimation(_owner, _stackID), hitCount(0), sh(-1) +: CBattleStackAnimation(_owner, _stackID), sh(-1) { } @@ -2608,6 +2608,8 @@ void CBattleInterface::showAliveStack(int ID, const std::map & stac int affectingSpeed = settings.animSpeed; if(animType == 1 || animType == 2) //standing stacks should not stand faster :) affectingSpeed = 2; + if(animType == 3 || animType == 11 || animType == 12 || animType == 13) //defend & attack should be slower + affectingSpeed = 1; bool incrementFrame = (animCount%(4/affectingSpeed)==0) && animType!=5 && animType!=20 && animType!=2; if(animType == 2) diff --git a/client/CBattleInterface.h b/client/CBattleInterface.h index e2180e7a4..e7d6bd4c3 100644 --- a/client/CBattleInterface.h +++ b/client/CBattleInterface.h @@ -158,7 +158,6 @@ class CBattleAttack : public CBattleStackAnimation protected: int IDby; //attacked stack int dest; //atacked hex - int hitCount; //for delaying animation bool reversing; int posShiftDueToDist; bool shooting;