mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
* water elemental will really be treated as 2 hex creature
* potential infinite loop in reverseCreature removed * proper handling of battle cursor
This commit is contained in:
@@ -554,8 +554,6 @@ bool CBattleInterface::reverseCreature(int number, int hex, bool wideTrick)
|
|||||||
show();
|
show();
|
||||||
CSDL_Ext::update();
|
CSDL_Ext::update();
|
||||||
SDL_framerateDelay(LOCPLINT->mainFPSmng);
|
SDL_framerateDelay(LOCPLINT->mainFPSmng);
|
||||||
if((animCount+1)%(4/animSpeed)==0)
|
|
||||||
creAnims[number]->incrementFrame();
|
|
||||||
}
|
}
|
||||||
creDir[number] = !creDir[number];
|
creDir[number] = !creDir[number];
|
||||||
|
|
||||||
|
@@ -33,7 +33,7 @@ void CCursorHandler::draw1()
|
|||||||
{
|
{
|
||||||
if(!Show) return;
|
if(!Show) return;
|
||||||
int x = xpos, y = ypos;
|
int x = xpos, y = ypos;
|
||||||
if(mode==1)
|
if(mode==1 && number!=6)
|
||||||
{
|
{
|
||||||
x-=16;
|
x-=16;
|
||||||
y-=16;
|
y-=16;
|
||||||
|
@@ -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[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
|
creatures[140].abilities.insert(DOUBLE_WIDE);//boar should be treated as double-wide
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user