From 1c65e2ffc01d689451f7e6391cf327edc2b7deb7 Mon Sep 17 00:00:00 2001 From: James Brown Date: Wed, 16 Oct 2002 11:58:56 +0000 Subject: Hack out 'Wait for actor drawn' for The Dig. See IRC logs for more details :) svn-id: r5165 --- scumm/script_v2.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 0b71d508df..e944a7c17b 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -2379,6 +2379,15 @@ void Scumm::o6_wait() case 226:{ /* wait until actor drawn */ Actor *a = derefActorSafe(pop(), "o6_wait:226"); int offs = (int16)fetchScriptWord(); + + return; // FIXME + // This wait command doesn't return at the + // correct times, which causes several script freezes + // in The Dig. Eg, planetarium lightbridge, + // and taking the rod in the museum AFTER looking at + // all the displays. Why? Is our code too optimised + // vs. the original? + if (a && a->isInCurrentRoom() && a->needRedraw) { _scriptPointer += offs; o6_breakHere(); -- cgit v1.2.3