[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.86,1.87 scummvm.cpp,2.157,2.158

James Brown ender at users.sourceforge.net
Fri May 16 23:34:13 CEST 2003


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

Modified Files:
	script.cpp scummvm.cpp 
Log Message:
Move some hacks around


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- script.cpp	17 May 2003 06:18:34 -0000	1.86
+++ script.cpp	17 May 2003 06:33:34 -0000	1.87
@@ -771,9 +771,11 @@
 	int args[16];
 	int verbScript;
 
-	if (_features & GF_AFTER_V2)
-		verbScript = 2;
-	else
+	if (_features & GF_AFTER_V2) {
+		verbScript = 4;
+		if (a == 1)	// Verb clicked
+			_scummVars[33] = cmd;
+	} else
 		verbScript = VAR(VAR_VERB_SCRIPT);
 
 	memset(args, 0, sizeof(args));

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -d -r2.157 -r2.158
--- scummvm.cpp	17 May 2003 06:14:08 -0000	2.157
+++ scummvm.cpp	17 May 2003 06:33:34 -0000	2.158
@@ -1733,7 +1733,10 @@
 
 	if (!_lastKeyHit)
 		return;
-
+	if (_lastKeyHit == '4') {
+		runScript(4, 0,0,0);
+		return;
+	}
 	if (_keyScriptNo && (_keyScriptKey == _lastKeyHit)) {
 		runScript(_keyScriptNo, 0, 0, 0);
 		return;





More information about the Scummvm-git-logs mailing list