[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.85,1.86 script_v2.cpp,2.77,2.78 verbs.cpp,1.41,1.42

[James Brown]

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

Modified Files:
	script.cpp script_v2.cpp verbs.cpp 
Log Message:
Fix invalid variable


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- script.cpp	16 May 2003 10:35:15 -0000	1.85
+++ script.cpp	17 May 2003 06:18:34 -0000	1.86
@@ -769,12 +769,19 @@
 
 void Scumm::runInputScript(int a, int cmd, int mode) {
 	int args[16];
+	int verbScript;
+
+	if (_features & GF_AFTER_V2)
+		verbScript = 2;
+	else
+		verbScript = VAR(VAR_VERB_SCRIPT);
+
 	memset(args, 0, sizeof(args));
 	args[0] = a;
 	args[1] = cmd;
 	args[2] = mode;
-	if (VAR(VAR_VERB_SCRIPT))
-		runScript(VAR(VAR_VERB_SCRIPT), 0, 0, args);
+	if (verbScript)
+		runScript(verbScript, 0, 0, args);
 }
 
 void Scumm::decreaseScriptDelay(int amount) {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.77
retrieving revision 2.78
diff -u -d -r2.77 -r2.78
--- script_v2.cpp	17 May 2003 06:04:21 -0000	2.77
+++ script_v2.cpp	17 May 2003 06:18:34 -0000	2.78
@@ -1211,7 +1211,10 @@
 	int cmd = getVarOrDirectWord(0x80);
 	int a2 = cmd >> 8;
 
-	if (a2 & 4) {warning("TODO: o2_cursorCommand(userface)");} // Toggle verbs on/off, etc
+	if (a2 & 4) {
+		_userPut = 1;
+		warning("TODO: o2_cursorCommand(userface)");
+	} // Toggle verbs on/off, etc
 
 	if (a2 & 1) {						// Freeze
 		if (a2 & 8)

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- verbs.cpp	17 May 2003 06:14:08 -0000	1.41
+++ verbs.cpp	17 May 2003 06:18:34 -0000	1.42
@@ -78,15 +78,6 @@
 			runInputScript(1, over != 0 ? _verbs[over].verbid : 0, code);
 		}
 	}
-
-#if 1
-		// FIXME - MM / Zak hack
-		if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
-			printf("Running script 4\n");
-			runScript(4, 0, 0, 0);
-		}
-#endif
-
 }
 
 void Scumm::verbMouseOver(int verb) {