libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 01:57:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

That should fix another segfault when clicking outside of the screen (bug #1708863)

Browse Source 
svn-id: r26629
This commit is contained in:
Sven Hesse 2007-04-27 21:25:03 +00:00
parent da93916adc
commit f479aa73ba
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
engines/gob/goblin.cpp
View File

@ -977,39 +977,48 @@ void Goblin::moveFindItem(int16 posX, int16 posY) {
break;
}
_pressedMapX = posX / 12;
_pressedMapY = posY / 6;
_pressedMapX = CLIP(posX / 12, 0, _vm->_map->_mapWidth - 1);
_pressedMapY = CLIP(posY / 6, 0, _vm->_map->_mapHeight - 1);
if ((_vm->_map->_itemsMap[_pressedMapY][_pressedMapX] == 0) && (i < 20)) {
if (_vm->_map->_itemsMap[_pressedMapY + 1][_pressedMapX] != 0) {
if ((_pressedMapY < (_vm->_map->_mapHeight - 1)) &&
(_vm->_map->_itemsMap[_pressedMapY + 1][_pressedMapX] != 0)) {
_pressedMapY++;
} else if (_vm->_map->_itemsMap[_pressedMapY + 1][_pressedMapX + 1] != 0) {
} else if ((_pressedMapX < (_vm->_map->_mapWidth - 1)) &&
(_pressedMapY < (_vm->_map->_mapHeight - 1)) &&
(_vm->_map->_itemsMap[_pressedMapY + 1][_pressedMapX + 1] != 0)) {
_pressedMapX++;
_pressedMapY++;
} else if (_vm->_map->_itemsMap[_pressedMapY][_pressedMapX + 1] != 0) {
} else if ((_pressedMapX < (_vm->_map->_mapWidth - 1)) &&
(_vm->_map->_itemsMap[_pressedMapY][_pressedMapX + 1] != 0)) {
_pressedMapX++;
} else if (_vm->_map->_itemsMap[_pressedMapY - 1][_pressedMapX + 1] != 0) {
} else if ((_pressedMapX < (_vm->_map->_mapWidth - 1)) &&
(_pressedMapY > 0) &&
(_vm->_map->_itemsMap[_pressedMapY - 1][_pressedMapX + 1] != 0)) {
_pressedMapX++;
_pressedMapY--;
} else if (_vm->_map->_itemsMap[_pressedMapY - 1][_pressedMapX] != 0) {
} else if ((_pressedMapY > 0) &&
(_vm->_map->_itemsMap[_pressedMapY - 1][_pressedMapX] != 0)) {
_pressedMapY--;
} else if (_vm->_map->_itemsMap[_pressedMapY - 1][_pressedMapX - 1] != 0) {
} else if ((_pressedMapY > 0) && (_pressedMapX > 0) &&
(_vm->_map->_itemsMap[_pressedMapY - 1][_pressedMapX - 1] != 0)) {
_pressedMapY--;
_pressedMapX--;
} else if (_vm->_map->_itemsMap[_pressedMapY][_pressedMapX - 1] != 0) {
} else if ((_pressedMapX > 0) &&
(_vm->_map->_itemsMap[_pressedMapY][_pressedMapX - 1] != 0)) {
_pressedMapX--;
} else if (_vm->_map->_itemsMap[_pressedMapY + 1][_pressedMapX - 1] != 0) {
} else if ((_pressedMapX > 0) &&
(_pressedMapY < (_vm->_map->_mapHeight - 1)) &&
(_vm->_map->_itemsMap[_pressedMapY + 1][_pressedMapX - 1] != 0)) {
_pressedMapX--;
_pressedMapY++;
}
}
} else {
_pressedMapX = posX / 12;
_pressedMapY = posY / 6;
_pressedMapX = CLIP(posX / 12, 0, _vm->_map->_mapWidth - 1);
_pressedMapY = CLIP(posY / 6, 0, _vm->_map->_mapHeight - 1);
}
_pressedMapX = CLIP((int) _pressedMapX, 0, _vm->_map->_mapWidth - 1);
_pressedMapY = CLIP((int) _pressedMapY, 0, _vm->_map->_mapHeight - 1);
}
void Goblin::moveCheckSelect(int16 framesCount, Gob_Object *gobDesc,