[Scummvm-cvs-logs] SF.net SVN: scummvm: [27368] scummvm/branches/branch-0-10-0/engines/agos
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Tue Jun 12 02:51:29 CEST 2007
Revision: 27368
http://scummvm.svn.sourceforge.net/scummvm/?rev=27368&view=rev
Author: Kirben
Date: 2007-06-11 17:51:27 -0700 (Mon, 11 Jun 2007)
Log Message:
-----------
Fix crash regressions in The Feeble Files, due to _currentTable not been set.
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/engines/agos/script.cpp
scummvm/branches/branch-0-10-0/engines/agos/vga_s2.cpp
Modified: scummvm/branches/branch-0-10-0/engines/agos/script.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/script.cpp 2007-06-11 23:24:46 UTC (rev 27367)
+++ scummvm/branches/branch-0-10-0/engines/agos/script.cpp 2007-06-12 00:51:27 UTC (rev 27368)
@@ -110,9 +110,11 @@
#ifdef __DS__
// HACK: Skip attempt to read Calypso's letter manually,
// due to speech segment been too large to fit into memory
- if (getGameType() == GType_SIMON1 && _currentTable->id == 71 && tmp == 1 && tmp2 == 1) {
- setScriptCondition(false);
- return;
+ if (getGameType() == GType_SIMON1 && _currentTable) {
+ if (_currentTable->id == 71 && tmp == 1 && tmp2 == 1) {
+ setScriptCondition(false);
+ return;
+ }
}
#endif
setScriptCondition(tmp == tmp2);
Modified: scummvm/branches/branch-0-10-0/engines/agos/vga_s2.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/vga_s2.cpp 2007-06-11 23:24:46 UTC (rev 27367)
+++ scummvm/branches/branch-0-10-0/engines/agos/vga_s2.cpp 2007-06-12 00:51:27 UTC (rev 27368)
@@ -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.
More information about the Scummvm-git-logs
mailing list