* removed bug causing significant increase of CPU consumption

* slightly optimized showing of battle interface
* animation of getting hit / death by shooting is displayed when it should be

CBattleInterface.cpp

@@ -20,7 +20,7 @@ extern SDL_Color zwykly;
 SDL_Surface * CBattleInterface::cellBorder, * CBattleInterface::cellShade;
 
 CBattleInterface::CBattleInterface(CCreatureSet * army1, CCreatureSet * army2, CGHeroInstance *hero1, CGHeroInstance *hero2)
-: printCellBorders(true), attackingHeroInstance(hero1), defendingHeroInstance(hero2), animCount(0), activeStack(-1), givenCommand(NULL), attackingInfo(NULL)
+: printCellBorders(true), attackingHeroInstance(hero1), defendingHeroInstance(hero2), animCount(0), activeStack(-1), givenCommand(NULL), attackingInfo(NULL), myTurn(false)
 {
 	//initializing armies
 	this->army1 = army1;
@@ -267,7 +267,7 @@ void CBattleInterface::show(SDL_Surface * to)
 	if(defendingHero)
 		defendingHero->show(to);
 
-	//showing units //a lot of work...
+	////showing units //a lot of work...
 	std::vector<int> stackAliveByHex[187];
 	//double loop because dead stacks should be printed first
 	for(std::map<int, CStack>::iterator j=stacks.begin(); j!=stacks.end(); ++j)
@@ -433,6 +433,34 @@ void CBattleInterface::stackRemoved(CStack stack)
 
 void CBattleInterface::stackKilled(int ID, int dmg, int killed, int IDby, bool byShooting)
 {
+	if(creAnims[ID]->getType() != 2)
+	{
+		return; //something went wrong
+	}
+	if(byShooting) //delay hit animation
+	{
+		CStack attacker = LOCPLINT->cb->battleGetStackByID(IDby);
+		while(true)
+		{
+			bool found = false;
+			for(std::list<SProjectileInfo>::const_iterator it = projectiles.begin(); it!=projectiles.end(); ++it)
+			{
+				if(it->creID == attacker.creature->idNumber)
+				{
+					found = true;
+					break;
+				}
+			}
+			if(!found)
+				break;
+			else
+			{
+				show();
+				CSDL_Ext::update();
+				SDL_framerateDelay(LOCPLINT->mainFPSmng);
+			}
+		}
+	}
 	creAnims[ID]->setType(5); //death
 	for(int i=0; i<creAnims[ID]->framesInGroup(5)-1; ++i)
 	{
@@ -448,6 +476,8 @@ void CBattleInterface::stackActivated(int number)
 {
 	givenCommand = NULL;
 	activeStack = number;
+	shadedHexes = LOCPLINT->cb->battleGetAvailableHexes(number);
+	myTurn = true;
 }
 
 void CBattleInterface::stackMoved(int number, int destHex, bool startMoving, bool endMoving)
@@ -628,6 +658,34 @@ void CBattleInterface::stackMoved(int number, int destHex, bool startMoving, boo
 
 void CBattleInterface::stackIsAttacked(int ID, int dmg, int killed, int IDby, bool byShooting)
 {
+	if(creAnims[ID]->getType() != 2)
+	{
+		return; //something went wrong
+	}
+	if(byShooting) //delay hit animation
+	{
+		CStack attacker = LOCPLINT->cb->battleGetStackByID(IDby);
+		while(true)
+		{
+			bool found = false;
+			for(std::list<SProjectileInfo>::const_iterator it = projectiles.begin(); it!=projectiles.end(); ++it)
+			{
+				if(it->creID == attacker.creature->idNumber)
+				{
+					found = true;
+					break;
+				}
+			}
+			if(!found)
+				break;
+			else
+			{
+				show();
+				CSDL_Ext::update();
+				SDL_framerateDelay(LOCPLINT->mainFPSmng);
+			}
+		}
+	}
 	creAnims[ID]->setType(3); //getting hit
 	for(int i=0; i<creAnims[ID]->framesInGroup(3); ++i)
 	{
@@ -642,6 +700,10 @@ void CBattleInterface::stackIsAttacked(int ID, int dmg, int killed, int IDby, bo
 
 void CBattleInterface::stackAttacking(int ID, int dest)
 {
+	if(attackingInfo != NULL)
+	{
+		return; //something went wrong
+	}
 	CStack aStack = LOCPLINT->cb->battleGetStackByID(ID); //attacking stack
 	if(aStack.creature->isDoubleWide())
 	{
@@ -725,6 +787,9 @@ void CBattleInterface::hexLclicked(int whichOne)
 {
 	if((whichOne%17)!=0 && (whichOne%17)!=16) //if player is trying to attack enemey unit or move creature stack
 	{
+		if(!myTurn)
+			return; //we are not permit to do anything
+
 		int atCre = LOCPLINT->cb->battleGetStack(whichOne); //creature at destination tile; -1 if there is no one
 		//LOCPLINT->cb->battleGetCreature();
 		if(atCre==-1) //normal move action
@@ -757,6 +822,10 @@ void CBattleInterface::hexLclicked(int whichOne)
 
 void CBattleInterface::stackIsShooting(int ID, int dest)
 {
+	if(attackingInfo != NULL)
+	{
+		return; //something went wrong
+	}
 	//projectile
 	float projectileAngle; //in radians; if positive, projectiles goes up
 	float straightAngle = 0.2f; //maximal angle in radians between straight horizontal line and shooting line for which shot is considered to be straight (absoulte value)
@@ -825,7 +894,6 @@ void CBattleInterface::stackIsShooting(int ID, int dest)
 
 void CBattleInterface::showRange(SDL_Surface * to, int ID)
 {
-	std::vector<int> shadedHexes = LOCPLINT->cb->battleGetAvailableHexes(ID);
 	for(int i=0; i<shadedHexes.size(); ++i)
 	{
 		CSDL_Ext::blit8bppAlphaTo24bpp(CBattleInterface::cellShade, NULL, to, &bfield[shadedHexes[i]].pos);

CBattleInterface.h

@@ -84,6 +84,7 @@ private:
 	std::map< int, bool > creDir; // <creatureID, if false reverse creature's animation>
 	unsigned char animCount;
 	int activeStack; //number of active stack; -1 - no one
+	std::vector<int> shadedHexes; //hexes available for active stack
 	void showRange(SDL_Surface * to, int ID); //show helper funtion ot mark range of a unit
 
 	class CAttHelper
@@ -111,7 +112,7 @@ private:
 	};
 	std::list<SProjectileInfo> projectiles;
 	void projectileShowHelper(SDL_Surface * to=NULL); //prints projectiles present on the battlefield
-
+	
 public:
 	CBattleInterface(CCreatureSet * army1, CCreatureSet * army2, CGHeroInstance *hero1, CGHeroInstance *hero2); //c-tor
 	~CBattleInterface(); //d-tor
@@ -122,6 +123,7 @@ public:
 	std::vector< CBattleObstacle * > obstacles; //vector of obstacles on the battlefield
 	static SDL_Surface * cellBorder, * cellShade;
 	BattleAction * givenCommand; //true if we have i.e. moved current unit
+	bool myTurn; //if true, interface is active (commands can be ordered
 
 	//button handle funcs:
 	void bOptionsf();

CConsoleHandler.cpp

@@ -154,6 +154,7 @@ int internalFunc(void * callback)
 			//SDL_Delay(100);
 			delete p;
 		}
+		SDL_Delay(10);
 	}
 	return -1;
 }

CPlayerInterface.cpp

@@ -2058,6 +2058,7 @@ BattleAction CPlayerInterface::activeStack(int stackID) //called when it's turn
 	BattleAction ret = *(dynamic_cast<CBattleInterface*>(curint)->givenCommand);
 	delete dynamic_cast<CBattleInterface*>(curint)->givenCommand;
 	dynamic_cast<CBattleInterface*>(curint)->givenCommand = NULL;
+	dynamic_cast<CBattleInterface*>(curint)->myTurn = false;
 	return ret;
 }