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

- fix for #32 (b)

Browse Source 
- fix for some warnings
This commit is contained in:
Ivan Savenko
2010-08-29 23:12:34 +00:00
parent 01776b6a04
commit 9e8d0651f6
6 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/CAdvmapInterface.cpp
View File

@@ -1773,7 +1773,7 @@ void CAdvMapInt::tileLClicked(const int3 &mp)
}
//check if we can select this object
bool canSelect = topBlocking && topBlocking->ID == HEROI_TYPE && topBlocking->tempOwner == LOCPLINT->playerID;
canSelect |= topBlocking && topBlocking->ID == TOWNI_TYPE && LOCPLINT->cb->getPlayerRelations(topBlocking->tempOwner, LOCPLINT->playerID);
canSelect |= topBlocking && topBlocking->ID == TOWNI_TYPE && LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, topBlocking->tempOwner);
if (selection->ID != HEROI_TYPE) //hero is not selected (presumably town)
{
@@ -1881,7 +1881,7 @@ void CAdvMapInt::tileHovered(const int3 &tile)
{
if(objAtTile)
{
if(objAtTile->ID == TOWNI_TYPE && LOCPLINT->cb->getPlayerRelations(objAtTile->tempOwner, LOCPLINT->playerID))
if(objAtTile->ID == TOWNI_TYPE && LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, objAtTile->tempOwner))
CGI->curh->changeGraphic(0, 3);
else if(objAtTile->ID == HEROI_TYPE && objAtTile->tempOwner == LOCPLINT->playerID)
CGI->curh->changeGraphic(0, 2);
@@ -1895,7 +1895,7 @@ void CAdvMapInt::tileHovered(const int3 &tile)
{
if(objAtTile->ID == HEROI_TYPE)
{
if(!LOCPLINT->cb->getPlayerRelations( objAtTile->tempOwner, LOCPLINT->playerID)) //enemy hero
if(!LOCPLINT->cb->getPlayerRelations( LOCPLINT->playerID, objAtTile->tempOwner)) //enemy hero
{
if(accessible)
CGI->curh->changeGraphic(0, 5 + turns*6);
@@ -1914,7 +1914,7 @@ void CAdvMapInt::tileHovered(const int3 &tile)
}
else if(objAtTile->ID == TOWNI_TYPE)
{
if(!LOCPLINT->cb->getPlayerRelations( objAtTile->tempOwner, LOCPLINT->playerID)) //enemy town
if(!LOCPLINT->cb->getPlayerRelations( LOCPLINT->playerID, objAtTile->tempOwner)) //enemy town
{
if(accessible)
{
@@ -1955,7 +1955,7 @@ void CAdvMapInt::tileHovered(const int3 &tile)
// Show battle cursor for guarded enemy garrisons, otherwise movement cursor.
if (garrObj&& garrObj->stacksCount()
&& !LOCPLINT->cb->getPlayerRelations( garrObj->tempOwner, LOCPLINT->playerID) )
&& !LOCPLINT->cb->getPlayerRelations( LOCPLINT->playerID, garrObj->tempOwner) )
CGI->curh->changeGraphic(0, 5 + turns*6);
else
CGI->curh->changeGraphic(0, 9 + turns*6);