From f0ffea2d6417ee1aac9ad3e92ffcfd5c8c6ebbd2 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 15 Oct 2003 09:40:44 +0000
Subject: Disable code which seems to be real cause of lock up in title screen
 of MI1 demos

svn-id: r10811
---
 scumm/camera.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scumm/camera.cpp')

diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index 872cb593ce..a59bd4ec57 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -367,13 +367,18 @@ void ScummEngine::actorFollowCamera(int act) {
 	if (!(_features & GF_NEW_CAMERA)) {
 		int old;
 
-		/* mi1 compatibilty */
+// Exactly why is this code needed for Monkey Island 1?
+// Seems to be the real cause of lock up at title screen
+// in Amiga and PC demo versions.
+/*
+		// MI1 compatibilty
 		if (act == 0) {
 			camera._mode = CM_NORMAL;
 			camera._follows = 0;
 			camera._movingToActor = false;
 			return;
 		}
+*/
 
 		old = camera._follows;
 		setCameraFollows(derefActor(act, "actorFollowCamera"));
-- 
cgit v1.2.3