[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.293.2.22,1.293.2.23

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17411

Modified Files:
      Tag: branch-0-6-0
	script_v6.cpp 
Log Message:
Backported COMI & SAM workarounds

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.293.2.22
retrieving revision 1.293.2.23
diff -u -d -r1.293.2.22 -r1.293.2.23
--- script_v6.cpp	13 Aug 2004 09:10:19 -0000	1.293.2.22
+++ script_v6.cpp	13 Aug 2004 09:11:10 -0000	1.293.2.23
@@ -811,6 +811,34 @@
 	getStackList(args, ARRAYSIZE(args));
 	script = pop();
 	flags = pop();
+	
+	// WORKAROUND bug #556558: At Dino Bungee National Memorial, the buttons for
+	// the Wally and Rex dinosaurs will always restart their speech, instead of 
+	// stopping and starting their speech. This was a script bug in the original 
+	// game.
+	if (_gameId == GID_SAMNMAX && _roomResource == 59 &&
+		vm.slot[_currentScript].number == 201 && script == 48) {
+		o6_breakHere();
+	}
+
+	// WORKAROUND bug #903223: In Puerto Pollo, if you have Guybrush examine
+	// the church clock, he'll read out the current time. Nice touch, only that
+	// it sounds crap in the german version (and maybe others, too). It seems
+	// the original engine of the german version played just a simple fixed
+	// text in this spot, for the above reason. Since the data files are
+	// unchanged, it must have been an engine hack job. No idea how they did
+	// it exactly, but this here is how we do it :-)
+	if (_gameId == GID_CMI && script == 204 &&
+		_currentRoom == 15 && vm.slot[_currentScript].number == 421 &&
+		_language == Common::DE_DEU) {
+
+		_actorToPrintStrFor = 1;
+		setStringVars(0);
+		actorTalk((const byte *)"/VDSO325/Whoa! Look at the time. Gotta scoot.");
+
+		return;
+	}
+	
 	runScript(script, (flags & 1) != 0, (flags & 2) != 0, args);
 }