aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-09-21 23:17:27 +0000
committerTravis Howell2006-09-21 23:17:27 +0000
commita3be69f4e4b1793c2ce1fe95d3d6db5ca3a7cf8b (patch)
treeb839dd19ca02a5c283b0ee039812442397fa249a
parent3a8537b6e3dbc934c32bab1782d412623ae54ce0 (diff)
downloadscummvm-rg350-a3be69f4e4b1793c2ce1fe95d3d6db5ca3a7cf8b.tar.gz
scummvm-rg350-a3be69f4e4b1793c2ce1fe95d3d6db5ca3a7cf8b.tar.bz2
scummvm-rg350-a3be69f4e4b1793c2ce1fe95d3d6db5ca3a7cf8b.zip
Fix regression in Amiga/Macintosh versions of FF
svn-id: r23973
-rw-r--r--engines/simon/simon.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 0ccce68968..993039dc4d 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -1272,8 +1272,12 @@ void SimonEngine::loadZone(uint vga_res) {
vpe->vgaFile2 = loadVGAFile(vga_res * 2 + 1, 2, size);
vpe->vgaFile2End = vpe->vgaFile2 + size;
- vpe->sfxFile = loadVGAFile(vga_res * 2, 3, size);
- vpe->sfxFileEnd = vpe->sfxFile + size;
+ vpe->sfxFile = NULL;
+ if ((getGameType() == GType_FF && getPlatform() == Common::kPlatformWindows) ||
+ getGameType() == GType_WW) {
+ vpe->sfxFile = loadVGAFile(vga_res * 2, 3, size);
+ vpe->sfxFileEnd = vpe->sfxFile + size;
+ }
}
void SimonEngine::setZoneBuffers() {