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

Check if a right click is in the map, so clicking on the border no longer opens an empty info windows.

Browse Source
This commit is contained in:
Frank Zago
2009-10-22 02:25:12 +00:00
parent e412619ce7
commit 336fee48aa
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/CAdvmapInterface.cpp
View File

@ -558,26 +558,19 @@ void CTerrainRect::clickLeft(tribool down, bool previousState)
void CTerrainRect::clickRight(tribool down, bool previousState) void CTerrainRect::clickRight(tribool down, bool previousState)
{ {
int3 mp = whichTileIsIt(); int3 mp = whichTileIsIt();
if ((mp.x<0)
|| (mp.y<0) if (!CGI->mh->map->isInTheMap(mp) || down != true)
|| down != true
)
{
LOCPLINT->adventureInt->handleRightClick("",down,this);
return; return;
}
std::vector < const CGObjectInstance * > objs = LOCPLINT->cb->getBlockingObjs(mp); std::vector < const CGObjectInstance * > objs = LOCPLINT->cb->getBlockingObjs(mp);
if(!objs.size()) { if(!objs.size()) {
// Bare or undiscovered terrain // Bare or undiscovered terrain
if (down) {
const TerrainTile * tile = LOCPLINT->cb->getTileInfo(mp); const TerrainTile * tile = LOCPLINT->cb->getTileInfo(mp);
if (tile) { if (tile) {
CSimpleWindow * temp = CMessage::genWindow(VLC->generaltexth->terrainNames[tile->tertype],LOCPLINT->playerID,true); CSimpleWindow * temp = CMessage::genWindow(VLC->generaltexth->terrainNames[tile->tertype],LOCPLINT->playerID,true);
CRClickPopupInt *rcpi = new CRClickPopupInt(temp,true); CRClickPopupInt *rcpi = new CRClickPopupInt(temp,true);
GH.pushInt(rcpi); GH.pushInt(rcpi);
} }
}
return; return;
} }