diff options
| author | Torbjörn Andersson | 2009-07-25 06:55:28 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2009-07-25 06:55:28 +0000 |
| commit | b92477f6ab31e34bc041bcc41f6692ed801f868d (patch) | |
| tree | 7bf21d531ee79342b3ec39b5e52d375fb8b3dd54 /engines/scumm/object.cpp | |
| parent | 93806dae8b482f0e0900db72425b6f8b59f28085 (diff) | |
| download | scummvm-rg350-b92477f6ab31e34bc041bcc41f6692ed801f868d.tar.gz scummvm-rg350-b92477f6ab31e34bc041bcc41f6692ed801f868d.tar.bz2 scummvm-rg350-b92477f6ab31e34bc041bcc41f6692ed801f868d.zip | |
Fixed GCC warnings.
svn-id: r42739
Diffstat (limited to 'engines/scumm/object.cpp')
| -rw-r--r-- | engines/scumm/object.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 084d1242c6..2eab2cfa3a 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -525,11 +525,12 @@ int ScummEngine::findObject(int x, int y) { } #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) + _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y) { if (_game.version == 0 && _v0ObjectIndex) return i; else return _objs[i].obj_nr; + } break; } } while ((_objs[b].state & mask) == a); @@ -1212,7 +1213,7 @@ void ScummEngine::setObjectName(int obj) { uint32 ScummEngine::getOBCDOffs(int object) const { int i; - if (_objectOwnerTable[object] != OF_OWNER_ROOM && (_game.version != 0) || _v0ObjectInInventory) + if ((_objectOwnerTable[object] != OF_OWNER_ROOM && (_game.version != 0)) || _v0ObjectInInventory) return 0; // V0 MM Return by Index |