diff options
| author | Travis Howell | 2005-04-23 09:53:56 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-23 09:53:56 +0000 |
| commit | cc526f0a01012c82a32b3c146e2006a1bf74c95b (patch) | |
| tree | bb22362551bc531907df00ac09900c6c7137d4a1 /scumm/room.cpp | |
| parent | 789007ec67d486eb111c7b3fcf82a2e951781138 (diff) | |
| download | scummvm-rg350-cc526f0a01012c82a32b3c146e2006a1bf74c95b.tar.gz scummvm-rg350-cc526f0a01012c82a32b3c146e2006a1bf74c95b.tar.bz2 scummvm-rg350-cc526f0a01012c82a32b3c146e2006a1bf74c95b.zip | |
Simpler check, since VAR_NEW_ROOM is no longer set in small header games.
svn-id: r17764
Diffstat (limited to 'scumm/room.cpp')
| -rw-r--r-- | scumm/room.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/room.cpp b/scumm/room.cpp index 459c96c1bb..81ec46f5a8 100644 --- a/scumm/room.cpp +++ b/scumm/room.cpp @@ -68,14 +68,14 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { } } - if (!(_features & GF_SMALL_HEADER) && VAR_NEW_ROOM != 0xFF) // Disable for SH games. Overwrites - VAR(VAR_NEW_ROOM) = room; // gamevars, eg Zak cashcards + if (VAR_NEW_ROOM != 0xFF) + VAR(VAR_NEW_ROOM) = room; runExitScript(); killScriptsAndResources(); clearEnqueue(); - if (_version >= 4 && _heversion <= 60) + if (_version >= 4 && _heversion <= 61) stopCycle(0); _sound->processSoundQues(); |