games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

* minor improvements

Browse Source
This commit is contained in:
mateuszb 2009-09-11 13:18:20 +00:00
parent c8ac6cf914
commit 34ef79d15e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/CBattleInterface.cpp
View File

@ -689,7 +689,7 @@ bool CBattleAttack::checkInitialConditions()
} }
CBattleAttack::CBattleAttack(CBattleInterface * _owner, int _stackID) 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<int, CStack> & stac
int affectingSpeed = settings.animSpeed; int affectingSpeed = settings.animSpeed;
if(animType == 1 || animType == 2) //standing stacks should not stand faster :) if(animType == 1 || animType == 2) //standing stacks should not stand faster :)
affectingSpeed = 2; 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; bool incrementFrame = (animCount%(4/affectingSpeed)==0) && animType!=5 && animType!=20 && animType!=2;
if(animType == 2) if(animType == 2)

1
client/CBattleInterface.h
View File

@ -158,7 +158,6 @@ class CBattleAttack : public CBattleStackAnimation
protected: protected:
int IDby; //attacked stack int IDby; //attacked stack
int dest; //atacked hex int dest; //atacked hex
int hitCount; //for delaying animation
bool reversing; bool reversing;
int posShiftDueToDist; int posShiftDueToDist;
bool shooting; bool shooting;