aboutsummaryrefslogtreecommitdiff
path: root/scumm/camera.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-10-15 09:40:44 +0000
committerTravis Howell2003-10-15 09:40:44 +0000
commitf0ffea2d6417ee1aac9ad3e92ffcfd5c8c6ebbd2 (patch)
tree8cd5b6f256dd6f5ed2e5e30ba36357f282b35bb3 /scumm/camera.cpp
parent83bf2f0e1749412792fdbf53625d78670a0dd224 (diff)
downloadscummvm-rg350-f0ffea2d6417ee1aac9ad3e92ffcfd5c8c6ebbd2.tar.gz
scummvm-rg350-f0ffea2d6417ee1aac9ad3e92ffcfd5c8c6ebbd2.tar.bz2
scummvm-rg350-f0ffea2d6417ee1aac9ad3e92ffcfd5c8c6ebbd2.zip
Disable code which seems to be real cause of lock up in title screen of MI1 demos
svn-id: r10811
Diffstat (limited to 'scumm/camera.cpp')
-rw-r--r--scumm/camera.cpp7
1 files changed, 6 insertions, 1 deletions
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"));