aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/vga_s2.cpp
diff options
context:
space:
mode:
authorTravis Howell2007-06-12 00:52:13 +0000
committerTravis Howell2007-06-12 00:52:13 +0000
commit138d4335d7a8e5d69beaa6fe77b6ddfdfc4252d5 (patch)
tree1f5b8161d697307576a2a2b3145a12070a459b44 /engines/agos/vga_s2.cpp
parentd6e5de3df39e192732bd3d8c7dc47d41ac613457 (diff)
downloadscummvm-rg350-138d4335d7a8e5d69beaa6fe77b6ddfdfc4252d5.tar.gz
scummvm-rg350-138d4335d7a8e5d69beaa6fe77b6ddfdfc4252d5.tar.bz2
scummvm-rg350-138d4335d7a8e5d69beaa6fe77b6ddfdfc4252d5.zip
Fix crash regressions in The Feeble Files, due to _currentTable not been set.
svn-id: r27369
Diffstat (limited to 'engines/agos/vga_s2.cpp')
-rw-r--r--engines/agos/vga_s2.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index c915e97bf8..9c05bc1100 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.cpp
@@ -52,10 +52,12 @@ void AGOSEngine_Simon2::setupVideoOpcodes(VgaOpcodeProc *op) {
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);