From 7104326563735c17d0fd0bb6ceffaa89d51c4fa8 Mon Sep 17 00:00:00 2001 From: mateuszb Date: Sun, 5 Oct 2008 12:34:14 +0000 Subject: [PATCH] * water elemental will really be treated as 2 hex creature * potential infinite loop in reverseCreature removed * proper handling of battle cursor --- CBattleInterface.cpp | 2 -- CCursorHandler.cpp | 2 +- hch/CCreatureHandler.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CBattleInterface.cpp b/CBattleInterface.cpp index 85bf15e59..74da61ae1 100644 --- a/CBattleInterface.cpp +++ b/CBattleInterface.cpp @@ -554,8 +554,6 @@ bool CBattleInterface::reverseCreature(int number, int hex, bool wideTrick) show(); CSDL_Ext::update(); SDL_framerateDelay(LOCPLINT->mainFPSmng); - if((animCount+1)%(4/animSpeed)==0) - creAnims[number]->incrementFrame(); } creDir[number] = !creDir[number]; diff --git a/CCursorHandler.cpp b/CCursorHandler.cpp index 4ecfcf285..2267da424 100644 --- a/CCursorHandler.cpp +++ b/CCursorHandler.cpp @@ -33,7 +33,7 @@ void CCursorHandler::draw1() { if(!Show) return; int x = xpos, y = ypos; - if(mode==1) + if(mode==1 && number!=6) { x-=16; y-=16; diff --git a/hch/CCreatureHandler.cpp b/hch/CCreatureHandler.cpp index 334567fb2..01096d7ee 100644 --- a/hch/CCreatureHandler.cpp +++ b/hch/CCreatureHandler.cpp @@ -455,7 +455,7 @@ void CCreatureHandler::loadCreatures() - creatures[122].abilities.insert(DOUBLE_WIDE);//water elemental should be treated as double-wide + creatures[115].abilities.insert(DOUBLE_WIDE);//water elemental should be treated as double-wide creatures[123].abilities.insert(DOUBLE_WIDE);//ice elemental should be treated as double-wide creatures[140].abilities.insert(DOUBLE_WIDE);//boar should be treated as double-wide }