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

[Travis Howell]

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

Modified Files:
	scummvm.cpp 
Log Message:

Fix COMI regression for now, seems to require x min/max values for camera to be set first.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.389
retrieving revision 2.390
diff -u -d -r2.389 -r2.390
--- scummvm.cpp	11 Sep 2003 13:43:30 -0000	2.389
+++ scummvm.cpp	12 Sep 2003 09:50:33 -0000	2.390
@@ -1954,6 +1954,9 @@
 		VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
 	}
 
+	VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2;
+	VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2);
+
 	if (_features & GF_NEW_CAMERA) {
 		VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2;
 		VAR(VAR_CAMERA_MAX_Y) = _roomHeight - (_screenHeight / 2);
@@ -1967,9 +1970,6 @@
 
 	if (_roomResource == 0)
 		return;
-
-	VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2;
-	VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2);
 
 	memset(gfxUsageBits, 0, sizeof(gfxUsageBits));