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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Nov 7 22:14:19 CET 2006


Revision: 24652
          http://svn.sourceforge.net/scummvm/?rev=24652&view=rev
Author:   fingolfin
Date:     2006-11-07 13:14:15 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Disabled an undocumented workaround for a supposed bug in FOA

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-11-07 21:09:18 UTC (rev 24651)
+++ scummvm/trunk/engines/scumm/script_v5.cpp	2006-11-07 21:14:15 UTC (rev 24652)
@@ -2575,11 +2575,6 @@
 	int nr2 = getVarOrDirectByte(PARAM_2);
 	int dist = fetchScriptByte();
 
-	if (nr == 106 && _game.id == GID_INDY4) {
-		printf("Bypassing Indy4 bug\n");
-		return;
-	}
-
 	if (_game.id == GID_LOOM && _game.version == 4 && nr == 1 && nr2 == 0 &&
 		dist == 255 && vm.slot[_currentScript].number == 98) {
 		// WORKAROUND bug #743615: LoomCD script 98 contains this:
@@ -2589,6 +2584,20 @@
 		return;
 	}
 
+
+/*
+FIXME: Disabled this undocumented workaround (which has been there since the
+very first revision of this code). It's likely related to the following workaround;
+if so, they should be merged. As it is, undocumented workarounds are bad and
+thus I disabled this. If anybody gets troubles due to this, we will be able to
+implement a proper fix.
+
+	if (nr == 106 && _game.id == GID_INDY4) {
+		printf("Bypassing Indy4 bug\n");
+		return;
+	}
+*/
+
 	if (_game.id == GID_INDY4 && nr == 1 && nr2 == 106 &&
 		dist == 255 && vm.slot[_currentScript].number == 210) {
 		// WORKAROUND bug: Work around an invalid actor bug when using the


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




More information about the Scummvm-git-logs mailing list