[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.77,2.78

[James Brown]

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

Modified Files:
	gfx.cpp 
Log Message:
V2 Vars Fix


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.77
retrieving revision 2.78
diff -u -d -r2.77 -r2.78
--- gfx.cpp	9 May 2003 01:17:31 -0000	2.77
+++ gfx.cpp	9 May 2003 06:03:48 -0000	2.78
@@ -2210,8 +2210,8 @@
 		}
 
 		cameraMoved();
-
-		if (pos != camera._cur.x && VAR(VAR_SCROLL_SCRIPT)) {
+	
+		if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT) && pos != camera._cur.x) {
 			VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 			runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
 		}
@@ -2220,11 +2220,8 @@
 
 void Scumm::cameraMoved() {
 	if (_features & GF_AFTER_V7) {
-
 		assert(camera._cur.x >= (_realWidth / 2) && camera._cur.y >= (_realHeight / 2));
-
 	} else {
-
 		if (camera._cur.x < (_realWidth / 2)) {
 			camera._cur.x = (_realWidth / 2);
 		} else if (camera._cur.x > _scrWidth - (_realWidth / 2)) {