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

[Kirben at users.sourceforge.net]

Revision: 27369
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27369&view=rev
Author:   Kirben
Date:     2007-06-11 17:52:13 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------
Fix crash regressions in The Feeble Files, due to _currentTable not been set.

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

Modified: scummvm/trunk/engines/agos/vga_s2.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s2.cpp	2007-06-12 00:51:27 UTC (rev 27368)
+++ scummvm/trunk/engines/agos/vga_s2.cpp	2007-06-12 00:52:13 UTC (rev 27369)
@@ -52,10 +52,12 @@
 void AGOSEngine::vc56_delayLong() {
 	uint16 num = vcReadVarOrWord() * _frameCount;
 
-	if (getGameType() == GType_FF && _currentTable->id == 20438 && _vgaCurSpriteId == 13 && _vgaCurZoneNum == 2) {
+	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.
-		num *= 2;
+		if (_currentTable->id == 20438 && _vgaCurSpriteId == 13 && _vgaCurZoneNum == 2) {
+			num *= 2;
+		}
 	}
 
 	addVgaEvent(num + _vgaBaseDelay, ANIMATE_EVENT, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum);


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