diff options
| author | Filippos Karapetis | 2012-11-06 14:18:44 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2012-11-06 14:18:44 +0200 |
| commit | 023f6f10c7c88a118788503e6188b44c5fce2ce5 (patch) | |
| tree | bb2a8fe0362a614e08a4f7daf736b14917d5c343 /engines/scumm/object.cpp | |
| parent | c34704972ece95bfbcf0c0837cf5b8102387194d (diff) | |
| download | scummvm-rg350-023f6f10c7c88a118788503e6188b44c5fce2ce5.tar.gz scummvm-rg350-023f6f10c7c88a118788503e6188b44c5fce2ce5.tar.bz2 scummvm-rg350-023f6f10c7c88a118788503e6188b44c5fce2ce5.zip | |
SCUMM: Fix bug #3526089 - "SCUMM: ZAK Can't get objects in the bus on Mars"
This fixes a regression in V1/V2 games when no actor direction
is set (like the Shuttle Bus scene in Zak V2). The regression
was caused by commit de0b5f76749add219a6b667d5d2d69fb8a86d959.
Thanks to digitall for his bisecting work, which aided a lot in
finding the actual issue for this bug
Diffstat (limited to 'engines/scumm/object.cpp')
| -rw-r--r-- | engines/scumm/object.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 77c75c4ad6..ed77a863cd 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -433,10 +433,14 @@ void ScummEngine::getObjectXYPos(int object, int &x, int &y, int &dir) { y = od.y_pos + (int16)READ_LE_UINT16(&imhd->old.hotspot[state].y); } } else if (_game.version <= 2) { - if (od.actordir) { - x = od.walk_x; - y = od.walk_y; - } else { + x = od.walk_x; + y = od.walk_y; + + // Adjust x, y when no actor direction is set, but only perform this + // adjustment for V0 games (e.g. MM C64), otherwise certain scenes in + // newer games are affected as well (e.g. the interior of the Shuttle + // Bus scene in Zak V2, where no actor is present). Refer to bug #3526089. + if (!od.actordir && _game.version == 0) { x = od.x_pos + od.width / 2; y = od.y_pos + od.height / 2; } |