diff options
| author | Travis Howell | 2005-05-29 13:08:25 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-29 13:08:25 +0000 |
| commit | 93731f3c4bc5791e94d9aab041b1deb1045c9a3c (patch) | |
| tree | 37b0ed78fc89f8bc5eaf56f8a7c1d38340e9f56e | |
| parent | dbba8d7318fea5acf030f3b49b8f2f07c5ab9afe (diff) | |
| download | scummvm-rg350-93731f3c4bc5791e94d9aab041b1deb1045c9a3c.tar.gz scummvm-rg350-93731f3c4bc5791e94d9aab041b1deb1045c9a3c.tar.bz2 scummvm-rg350-93731f3c4bc5791e94d9aab041b1deb1045c9a3c.zip | |
resourceMapper isn't used in HE72+ games.
svn-id: r18291
| -rw-r--r-- | scumm/room.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/room.cpp b/scumm/room.cpp index 330530a0f8..01e5f26be6 100644 --- a/scumm/room.cpp +++ b/scumm/room.cpp @@ -112,7 +112,7 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { _currentRoom = room; VAR(VAR_ROOM) = room; - if (room >= 0x80 && _version < 7) + if (room >= 0x80 && _version < 7 && _heversion <= 71) _roomResource = _resourceMapper[room & 0x7F]; else _roomResource = room; diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index d4e5907cf8..7d176c90c7 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -563,7 +563,7 @@ void ScummEngine_v70he::o70_resourceRoutines() { break; case 111: // SO_LOCK_ROOM resid = pop(); - if (resid > 0x7F) + if (_heversion <= 71 && resid > 0x7F) resid = _resourceMapper[resid & 0x7F]; res.lock(rtRoom, resid); res.lock(rtRoomImage, resid); @@ -584,7 +584,7 @@ void ScummEngine_v70he::o70_resourceRoutines() { break; case 115: // SO_UNLOCK_ROOM resid = pop(); - if (resid > 0x7F) + if (_heversion <= 71 && resid > 0x7F) resid = _resourceMapper[resid & 0x7F]; res.unlock(rtRoom, resid); res.unlock(rtRoomImage, resid); |