diff options
| -rw-r--r-- | scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index b000c355be..05d6cdd5a0 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -470,7 +470,7 @@ void Scumm::ensureResourceLoaded(int type, int i) debug(9, "ensureResourceLoaded(%s,%d)", resTypeFromId(type), i); - if (type == rtRoom && i > 127) { + if (type == rtRoom && i > 127 && !(_features & GF_AFTER_V7)) { i = _resourceMapper[i & 127]; } diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index f071bdcce0..656ccec7ed 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -578,7 +578,7 @@ void Scumm::startScene(int room, Actor * a, int objectNr) _currentRoom = room; _vars[VAR_ROOM] = room; - if (room >= 0x80) + if (room >= 0x80 && !(_features & GF_AFTER_V7)) _roomResource = _resourceMapper[room & 0x7F]; else _roomResource = room; |