[Scummvm-cvs-logs] SF.net SVN: scummvm: [22305] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22305
Author:   kirben
Date:     2006-05-03 05:54:37 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22305&view=rev

Log Message:
-----------
Add work around for glitches that occurs on map, when Simon rides lion to the goblin camp, in non-English versions of Simon2

Modified Paths:
--------------
    scummvm/trunk/engines/simon/subroutine.cpp
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/simon/subroutine.cpp	2006-05-03 11:42:50 UTC (rev 22304)
+++ scummvm/trunk/engines/simon/subroutine.cpp	2006-05-03 12:54:37 UTC (rev 22305)
@@ -235,6 +235,16 @@
 	if (++_recursionDepth > 40)
 		error("Recursion error");
 
+	// WORKAROUND: Bit Flag 171 isn't set when Simon rides the lion to the
+	// goblin camp in non-English versions. Bit Flag 171 is required to display 
+	// the red trail between locations on the map, during the ride.
+	if (getGameType() == GType_SIMON2) {
+		if (sub->id == 13020)
+			setBitFlag(171, true);
+		if (sub->id == 13021)
+			setBitFlag(171, false);
+	}
+
 	sl = (SubroutineLine *)((byte *)sub + sub->first);
 
 	while ((byte *)sl != (byte *)sub) {

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-05-03 11:42:50 UTC (rev 22304)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-05-03 12:54:37 UTC (rev 22305)
@@ -2276,7 +2276,7 @@
 
 void SimonEngine::vc63_fastFadeIn() {
 	if (getGameType() == GType_FF) {
-			_paletteColorCount = 256;
+		_paletteColorCount = 256;
 	} else {
 		_paletteColorCount = 208;
 		if (_windowNum != 4) {


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