[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.28,1.29

James Brown ender at users.sourceforge.net
Wed Oct 16 05:00:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv627

Modified Files:
	script_v2.cpp 
Log Message:
Hack out 'Wait for actor drawn' for The Dig. See IRC logs for more 
details :)


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- script_v2.cpp	16 Oct 2002 11:00:48 -0000	1.28
+++ script_v2.cpp	16 Oct 2002 11:58:56 -0000	1.29
@@ -2379,6 +2379,15 @@
 	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();





More information about the Scummvm-git-logs mailing list