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

[Kirben at users.sourceforge.net]

Revision: 42693
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42693&view=rev
Author:   Kirben
Date:     2009-07-24 12:28:53 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
Add workaround for bug #2826144 - SAM: Game hangs when talking to bigfoot guard.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v6.cpp

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2009-07-24 12:13:00 UTC (rev 42692)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2009-07-24 12:28:53 UTC (rev 42693)
@@ -701,6 +701,14 @@
 
 void ScummEngine_v6::o6_jump() {
 	int offset = fetchScriptWordSigned();
+
+	// WORKAROUND bug #2826144: Talking to the guard at the bigfoot party, after 
+	// he's let you inside, will cause the game to hang, if you end the conversation.
+	// This is a script bug, due to a missing jump in one segment of the script.
+	if (_game.id == GID_SAMNMAX && vm.slot[_currentScript].number == 101 && readVar(0x8000 + 97) == 1 && offset == 1) {
+		offset = 1984;
+	} 
+
 	_scriptPointer += offset;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.