From cc526f0a01012c82a32b3c146e2006a1bf74c95b Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sat, 23 Apr 2005 09:53:56 +0000 Subject: Simpler check, since VAR_NEW_ROOM is no longer set in small header games. svn-id: r17764 --- scumm/room.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scumm/room.cpp') 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(); -- cgit v1.2.3