[Scummvm-cvs-logs] SF.net SVN: scummvm: [20905] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 20905
Author:   kirben
Date:     2006-02-25 21:48:40 -0800 (Sat, 25 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20905&view=rev

Log Message:
-----------
Move debug mode setting to initScummVars(), so it is reset when game is restarted

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/vars.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-02-26 03:03:59 UTC (rev 20904)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-02-26 05:48:40 UTC (rev 20905)
@@ -1254,12 +1254,6 @@
 	scummInit();
 	initScummVars();
 
-	if (VAR_DEBUGMODE != 0xFF) {
-		VAR(VAR_DEBUGMODE) = _debugMode;
-		if (_game.heversion >= 80 && _debugMode)
-			VAR(85) = 1;
-	}
-
 	if (_imuse) {
 		_imuse->setBase(res.address[rtSound]);
 	}

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2006-02-26 03:03:59 UTC (rev 20904)
+++ scummvm/trunk/engines/scumm/vars.cpp	2006-02-26 05:48:40 UTC (rev 20905)
@@ -726,6 +726,12 @@
 		VAR(VAR_ROOM_HEIGHT) = _screenHeight;
 	}
 
+	if (VAR_DEBUGMODE != 0xFF) {
+		VAR(VAR_DEBUGMODE) = _debugMode;
+		if (_game.heversion >= 80 && _debugMode)
+			VAR(85) = 1;
+	}
+
 	if (VAR_FADE_DELAY != 0xFF)
 		VAR(VAR_FADE_DELAY) = 3;