[Scummvm-cvs-logs] CVS: scummvm/scumm camera.cpp,2.26,2.27

Travis Howell kirben at users.sourceforge.net
Wed Jul 21 21:38:01 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2280/scumm

Modified Files:
	camera.cpp 
Log Message:

Remove unused code, VAR_SCROLL_SCRIPT is never set for scumm 1/2.


Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- camera.cpp	8 Jul 2004 10:47:44 -0000	2.26
+++ camera.cpp	22 Jul 2004 04:37:20 -0000	2.27
@@ -49,10 +49,7 @@
 		camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X);
 
 	if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT)) {
-		if (_version <= 2)
-			VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8;
-		else
-			VAR(VAR_CAMERA_POS_X) = camera._cur.x;
+		VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 		runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
 	}
 
@@ -226,10 +223,7 @@
 	cameraMoved();
 
 	if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT) && pos != camera._cur.x) {
-		if (_version <= 2)
-			VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8;
-		else
-			VAR(VAR_CAMERA_POS_X) = camera._cur.x;
+		VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 		runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
 	}
 }





More information about the Scummvm-git-logs mailing list