[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.108,2.109 scummvm.cpp,2.153,2.154

[Max Horn]

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

Modified Files:
	gfx.cpp scummvm.cpp 
Log Message:
V2 camera fix (again thanks MadMoose)

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.108
retrieving revision 2.109
diff -u -d -r2.108 -r2.109
--- gfx.cpp	16 May 2003 00:07:47 -0000	2.108
+++ gfx.cpp	16 May 2003 23:54:58 -0000	2.109
@@ -2050,7 +2050,10 @@
 			camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X);
 
 		if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT)) {
-			VAR(VAR_CAMERA_POS_X) = camera._cur.x;
+			if (_features & GF_AFTER_V2)
+				VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8;
+			else
+				VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 			runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
 		}
 
@@ -2274,7 +2277,10 @@
 		cameraMoved();
 	
 		if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT) && pos != camera._cur.x) {
-			VAR(VAR_CAMERA_POS_X) = camera._cur.x;
+			if (_features & GF_AFTER_V2)
+				VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8;
+			else
+				VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 			runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
 		}
 	}

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.153
retrieving revision 2.154
diff -u -d -r2.153 -r2.154
--- scummvm.cpp	16 May 2003 20:38:04 -0000	2.153
+++ scummvm.cpp	16 May 2003 23:54:58 -0000	2.154
@@ -877,6 +877,8 @@
 	if (_features & GF_AFTER_V7) {
 		VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 		VAR(VAR_CAMERA_POS_Y) = camera._cur.y;
+	} else if (_features & GF_AFTER_V2) {
+		VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8;
 	} else {
 		VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 	}