[Scummvm-cvs-logs] SF.net SVN: scummvm: [23973] scummvm/trunk/engines/simon/simon.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Sep 22 01:17:32 CEST 2006


Revision: 23973
          http://svn.sourceforge.net/scummvm/?rev=23973&view=rev
Author:   kirben
Date:     2006-09-21 16:17:27 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Fix regression in Amiga/Macintosh versions of FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-09-21 20:17:32 UTC (rev 23972)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-09-21 23:17:27 UTC (rev 23973)
@@ -1272,8 +1272,12 @@
 	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() {


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