diff options
| author | Tobias Gunkel | 2012-01-10 22:11:11 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:30 +0100 |
| commit | df07d2db297b263142a0505d880e57b17e681a97 (patch) | |
| tree | 5a48af9a7abc5aea9b596963d548abb7782e742e /engines | |
| parent | c010da00a425ff4be1619093327c46ab2e6c1381 (diff) | |
| download | scummvm-rg350-df07d2db297b263142a0505d880e57b17e681a97.tar.gz scummvm-rg350-df07d2db297b263142a0505d880e57b17e681a97.tar.bz2 scummvm-rg350-df07d2db297b263142a0505d880e57b17e681a97.zip | |
SCUMM: fix a regression in v0
Found by segra.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 670b2cb79c..26597864fd 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -1223,7 +1223,8 @@ uint32 ScummEngine::getOBCDOffs(int object) const { return 0; for (i = (_numLocalObjects-1); i > 0; i--) { - if (_objs[i].obj_nr == OBJECT_V0_NR(object)) { + int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object); + if (_objs[i].obj_nr == nr) { if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object)) continue; if (_objs[i].fl_object_index != 0) |