From c805e260a9a871db17866c2957ccc9042d46763c Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 12 Sep 2003 09:50:33 +0000
Subject: Fix COMI regression for now, seems to require x min/max values for
 camera to be set first.

svn-id: r10191
---
 scumm/scummvm.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 991fde6f45..a28bf4934e 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1954,6 +1954,9 @@ void Scumm::startScene(int room, Actor *a, int objectNr) {
 		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);
@@ -1968,9 +1971,6 @@ void Scumm::startScene(int room, Actor *a, int objectNr) {
 	if (_roomResource == 0)
 		return;
 
-	VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2;
-	VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2);
-
 	memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
 
 	if (a) {
-- 
cgit v1.2.3