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

Fixed #970.

Browse Source 
Fixed issue where cursed ground obstacles were appearing on holy ground (and vice versa).
Fixed battle interface blocking itself up after clicking on owned stack to open creature window.
This commit is contained in:
Michał W. Urbańczyk
2012-05-26 11:01:31 +00:00
parent 470885d719
commit 77e7a25ed7
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/BattleInterface/CBattleInterface.cpp
View File

@ -2726,8 +2726,12 @@ void CBattleInterface::handleHex(BattleHex myNumber, int eventType)
this->console->whoSetAlter = 0; this->console->whoSetAlter = 0;
} }
if(eventType == LCLICK && realizeAction) if(eventType == LCLICK && realizeAction)
{
//opening creature window shouldn't affect myTurn...
if(currentAction != CREATURE_INFO)
{ {
myTurn = false; //tends to crash with empty calls myTurn = false; //tends to crash with empty calls
}
realizeAction(); realizeAction();
CCS->curh->changeGraphic(ECursor::COMBAT, ECursor::COMBAT_POINTER); CCS->curh->changeGraphic(ECursor::COMBAT, ECursor::COMBAT_POINTER);
this->console->alterText(""); this->console->alterText("");
@ -3448,7 +3452,7 @@ Point CBattleInterface::whereToBlitObstacleImage(SDL_Surface *image, const CObst
int offset = image->h % 42; int offset = image->h % 42;
if(obstacle.obstacleType == CObstacleInstance::USUAL) if(obstacle.obstacleType == CObstacleInstance::USUAL)
{ {
if(obstacle.getInfo().blockedTiles.front() < 0) if(obstacle.getInfo().blockedTiles.front() < 0 || offset > 37) //second or part is for holy ground ID=62,65,63
offset -= 42; offset -= 42;
} }
else if(obstacle.obstacleType == CObstacleInstance::QUICKSAND) else if(obstacle.obstacleType == CObstacleInstance::QUICKSAND)

4
lib/GameConstants.h
View File

@ -233,8 +233,10 @@ namespace BattlefieldBI
{ {
NONE = -1, NONE = -1,
COASTAL, COASTAL,
CURSED_GROUND, //Discrepency from ERM BI description - we have magic plains and cursed gronds swapped
MAGIC_PLAINS, MAGIC_PLAINS,
CURSED_GROUND,
//
HOLY_GROUND, HOLY_GROUND,
EVIL_FOG, EVIL_FOG,
CLOVER_FIELD, CLOVER_FIELD,