[Scummvm-cvs-logs] SF.net SVN: scummvm: [20785] scummvm/trunk/engines/scumm/script_v5.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Feb 20 06:02:13 CET 2006


Revision: 20785
Author:   fingolfin
Date:     2006-02-20 06:01:49 -0800 (Mon, 20 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20785&view=rev

Log Message:
-----------
Workaround for bug #1308033 (FOA: skips single line of dialogue)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v5.cpp
Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp	2006-02-20 13:31:33 UTC (rev 20784)
+++ scummvm/trunk/engines/scumm/script_v5.cpp	2006-02-20 14:01:49 UTC (rev 20785)
@@ -2290,10 +2290,21 @@
 }
 
 void ScummEngine_v5::o5_stopScript() {
+	const byte *oldaddr = _scriptPointer - 1;
 	int script;
 
 	script = getVarOrDirectByte(PARAM_1);
 
+	if (_gameId == GID_INDY4 && script == 164 &&
+		_roomResource == 50 && vm.slot[_currentScript].number == 213 && VAR(VAR_HAVE_MSG)) {
+		// WORKAROUND bug #1308033: Due to a script bug, a line of text is skipped
+		// which Indy is supposed to speak when he finds Orichalcum in some old
+		// bones in the caves below Crete.
+		_scriptPointer = oldaddr;
+		o5_breakHere();
+		return;
+	}
+
 	if (!script)
 		stopObjectCode();
 	else







More information about the Scummvm-git-logs mailing list