[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.184,1.185 vars.cpp,1.46,1.47 scummvm.cpp,2.138,2.139

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26154

Modified Files:
	scumm.h vars.cpp scummvm.cpp 
Log Message:
renamed VAR_UNK_SCRIPT to VAR_SAVELOAD_SCRIPT; fixed V8 save/load (no (known) VAR_SAVELOAD_SCRIPT value for V8)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- scumm.h	12 May 2003 21:53:36 -0000	1.184
+++ scumm.h	13 May 2003 17:51:56 -0000	1.185
@@ -1143,8 +1143,8 @@
 	byte VAR_RIGHTBTN_HOLD;
 	byte VAR_MOUSE_BUTTONS;
 	byte VAR_MOUSE_HOLD;
-	byte VAR_UNK_SCRIPT;
-	byte VAR_UNK_SCRIPT_2;
+	byte VAR_SAVELOAD_SCRIPT;
+	byte VAR_SAVELOAD_SCRIPT2;
 
 	byte VAR_DEFAULT_TALK_DELAY;
 	byte VAR_CHARSET_MASK;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- vars.cpp	8 May 2003 15:48:50 -0000	1.46
+++ vars.cpp	13 May 2003 17:51:56 -0000	1.47
@@ -184,8 +184,8 @@
 	VAR_HOOK_SCRIPT = 57;
 	VAR_CUTSCENE_START_SCRIPT = 58;
 	VAR_CUTSCENE_END_SCRIPT = 59;
-	VAR_UNK_SCRIPT = 60;
-	VAR_UNK_SCRIPT_2 = 61;
+	VAR_SAVELOAD_SCRIPT = 60;
+	VAR_SAVELOAD_SCRIPT2 = 61;
 
 	VAR_CUTSCENEEXIT_KEY = 62;
 	VAR_RESTART_KEY = 63;			// ???

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.138
retrieving revision 2.139
diff -u -d -r2.138 -r2.139
--- scummvm.cpp	11 May 2003 00:03:03 -0000	2.138
+++ scummvm.cpp	13 May 2003 17:51:56 -0000	2.139
@@ -501,8 +501,8 @@
 	VAR_RIGHTBTN_HOLD = 0xFF;
 	VAR_MOUSE_BUTTONS = 0xFF;
 	VAR_MOUSE_HOLD = 0xFF;
-	VAR_UNK_SCRIPT = 0xFF;
-	VAR_UNK_SCRIPT_2 = 0xFF;
+	VAR_SAVELOAD_SCRIPT = 0xFF;
+	VAR_SAVELOAD_SCRIPT2 = 0xFF;
 
 	VAR_DEFAULT_TALK_DELAY = 0xFF;
 	VAR_CHARSET_MASK = 0xFF;
@@ -1767,13 +1767,13 @@
 		} else
 			exitCutscene();
 	} else if (_lastKeyHit == saveloadkey && _currentRoom != 0) {
-		if (_features & GF_AFTER_V7)
-			runScript(VAR(VAR_UNK_SCRIPT), 0, 0, 0);
+		if (VAR_SAVELOAD_SCRIPT != 0xFF)
+			runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
 
 		saveloadDialog();		// Display NewGui
 
-		if (_features & GF_AFTER_V7)
-			runScript(VAR(VAR_UNK_SCRIPT_2), 0, 0, 0);
+		if (VAR_SAVELOAD_SCRIPT2 != 0xFF)
+			runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
 		return;
 	} else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) {
 		_talkDelay = 0;