[Scummvm-cvs-logs] SF.net SVN: scummvm:[40248] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 40248
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40248&view=rev
Author:   Kirben
Date:     2009-05-02 23:30:08 +0000 (Sat, 02 May 2009)

Log Message:
-----------
Add alternative work around for bug in The Feeble Files.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/script.cpp
    scummvm/trunk/engines/agos/vga_s2.cpp

Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp	2009-05-02 23:02:18 UTC (rev 40247)
+++ scummvm/trunk/engines/agos/script.cpp	2009-05-02 23:30:08 UTC (rev 40248)
@@ -248,7 +248,17 @@
 void AGOSEngine::o_let() {
 	// 42: set var
 	uint var = getVarWrapper();
-	writeVariable(var, getVarOrWord());
+	uint value = getVarOrWord();
+
+	if (getGameType() == GType_FF && _currentTable) {
+		// WORKAROUND: When the repair man comes to fix the car, the game doesn't
+		// wait long enough for the screen to completely scroll to the left side.
+		if (_currentTable->id == 20438 && var == 103 && value == 60) {
+			value = 71;
+		}
+	}
+
+	writeVariable(var, value);
 }
 
 void AGOSEngine::o_add() {

Modified: scummvm/trunk/engines/agos/vga_s2.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s2.cpp	2009-05-02 23:02:18 UTC (rev 40247)
+++ scummvm/trunk/engines/agos/vga_s2.cpp	2009-05-02 23:30:08 UTC (rev 40248)
@@ -52,14 +52,6 @@
 void AGOSEngine::vc56_delayLong() {
 	uint16 num = vcReadVarOrWord() * _frameCount;
 
-	if (getGameType() == GType_FF && _currentTable) {
-		// WORKAROUND: When the repair man comes to fix the car, the game doesn't
-		// wait long enough for the screen to completely scroll to the left side.
-		if (_currentTable->id == 20438 && _vgaCurSpriteId == 13 && _vgaCurZoneNum == 2) {
-			num *= 2;
-		}
-	}
-
 	addVgaEvent(num + _vgaBaseDelay, ANIMATE_EVENT, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum);
 	_vcPtr = (byte *)&_vcGetOutOfCode;
 }


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