diff options
| author | Max Horn | 2002-12-28 00:45:44 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-28 00:45:44 +0000 |
| commit | 319facc9c3a54bff3adab663e32f37bddb07c9e9 (patch) | |
| tree | e0ac0fed5e810ce21890eb6a645afc1f1a04e20c /scumm/object.cpp | |
| parent | edd08521c3e0eaf8b29da53cb899f973ee5d9d6f (diff) | |
| download | scummvm-rg350-319facc9c3a54bff3adab663e32f37bddb07c9e9.tar.gz scummvm-rg350-319facc9c3a54bff3adab663e32f37bddb07c9e9.tar.bz2 scummvm-rg350-319facc9c3a54bff3adab663e32f37bddb07c9e9.zip | |
cleanup
svn-id: r6214
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index bf2676f6cc..22b1b68155 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -266,9 +266,8 @@ int Scumm::findObject(int x, int y) a = _objs[b].parentstate; b = _objs[b].parent; if (b == 0) { - 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) + 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; } |