[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.388,2.389

Max Horn fingolfin at users.sourceforge.net
Thu Sep 11 06:48:08 CEST 2003


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

Modified Files:
	scummvm.cpp 
Log Message:
fix for room-scroll regression in V1/V2 (essentially, we never init the camera y-values, except here, for these games)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.388
retrieving revision 2.389
diff -u -d -r2.388 -r2.389
--- scummvm.cpp	11 Sep 2003 13:39:27 -0000	2.388
+++ scummvm.cpp	11 Sep 2003 13:43:30 -0000	2.389
@@ -1948,22 +1948,21 @@
 	else
 		loadRoomObjects();
 
-	if (_version > 2) {
 	
-		if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) {
-			VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth;
-			VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
-		}
-	
-		if (_features & GF_NEW_CAMERA) {
-			VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2;
-			VAR(VAR_CAMERA_MAX_Y) = _roomHeight - (_screenHeight / 2);
-			setCameraAt(_screenWidth / 2, _screenHeight / 2);
-		} else {
-			camera._mode = CM_NORMAL;
+	if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) {
+		VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth;
+		VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
+	}
+
+	if (_features & GF_NEW_CAMERA) {
+		VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2;
+		VAR(VAR_CAMERA_MAX_Y) = _roomHeight - (_screenHeight / 2);
+		setCameraAt(_screenWidth / 2, _screenHeight / 2);
+	} else {
+		camera._mode = CM_NORMAL;
+		if (_version > 2)
 			camera._cur.x = camera._dest.x = _screenWidth / 2;
-			camera._cur.y = camera._dest.y = _screenHeight / 2;
-		}
+		camera._cur.y = camera._dest.y = _screenHeight / 2;
 	}
 
 	if (_roomResource == 0)





More information about the Scummvm-git-logs mailing list