[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.75,2.76 script.cpp,1.78,1.79

[Max Horn]

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

Modified Files:
	gfx.cpp script.cpp 
Log Message:
yet more v2 var fixes

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.75
retrieving revision 2.76
diff -u -d -r2.75 -r2.76
--- gfx.cpp	8 May 2003 20:37:06 -0000	2.75
+++ gfx.cpp	8 May 2003 21:14:20 -0000	2.76
@@ -1982,7 +1982,7 @@
 		if (camera._cur.x > VAR(VAR_CAMERA_MAX_X))
 			camera._cur.x = VAR(VAR_CAMERA_MAX_X);
 
-		if (VAR(VAR_SCROLL_SCRIPT)) {
+		if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT)) {
 			VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 			runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
 		}

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- script.cpp	8 May 2003 15:58:30 -0000	1.78
+++ script.cpp	8 May 2003 21:14:21 -0000	1.79
@@ -589,10 +589,14 @@
 
 
 void Scumm::runHook(int i) {
-	int tmp[16];
-	tmp[0] = i;
-	if (VAR(VAR_HOOK_SCRIPT)) {
-		runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp);
+	if (_features & GF_AFTER_V2) {
+		// FIXME - TODO
+	} else {
+		int tmp[16];
+		tmp[0] = i;
+		if (VAR(VAR_HOOK_SCRIPT)) {
+			runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp);
+		}
 	}
 }