thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix findObject(x,y) for DIG and COMI

Browse source
This commit is contained in:
Andrea Boscarino 2021-08-02 19:40:16 +02:00 • committed by Paweł Kołodziejski
parent 064a266a22
commit d6912058c7
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/scumm/object.cpp
View file

@ -540,9 +540,15 @@ int ScummEngine::findObject(int x, int y) {
return _objs[i].obj_nr;
}
#endif
if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
_objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
return _objs[i].obj_nr;
if (_game.id == GID_CMI || _game.id == GID_DIG) {
if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos >= x &&
_objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos >= y)
return _objs[i].obj_nr;
} else {
if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
_objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
return _objs[i].obj_nr;
}
break;
}
} while ((_objs[b].state & mask) == a);