[Scummvm-cvs-logs] CVS: scummvm/scumm room.cpp,1.7,1.8

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10540/scumm

Modified Files:
	room.cpp 
Log Message:

Simpler check, since VAR_NEW_ROOM is no longer set in small header games.


Index: room.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/room.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- room.cpp	20 Apr 2005 18:21:00 -0000	1.7
+++ room.cpp	23 Apr 2005 09:53:56 -0000	1.8
@@ -68,14 +68,14 @@
 		}
 	}
 
-	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();