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

[kirben at users.sourceforge.net]

Revision: 23898
          http://svn.sourceforge.net/scummvm/?rev=23898&view=rev
Author:   kirben
Date:     2006-09-16 15:35:21 -0700 (Sat, 16 Sep 2006)

Log Message:
-----------
Fix bug #1559767 - SIMONWIN: Crashes on start-up

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

Modified: scummvm/trunk/engines/simon/sound.cpp
===================================================================
--- scummvm/trunk/engines/simon/sound.cpp	2006-09-16 21:03:04 UTC (rev 23897)
+++ scummvm/trunk/engines/simon/sound.cpp	2006-09-16 22:35:21 UTC (rev 23898)
@@ -427,8 +427,7 @@
 	file->open(filename);
 
 	if (file->isOpen() == false) {
-		if (atoi(filename + 6) != 1 && atoi(filename + 6) != 30)
-			error("readSfxFile: Can't load sfx file %s", filename);
+		error("readSfxFile: Can't load sfx file %s", filename);
 	}
 
 	delete _effects;

Modified: scummvm/trunk/engines/simon/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/simon/subroutine.cpp	2006-09-16 21:03:04 UTC (rev 23897)
+++ scummvm/trunk/engines/simon/subroutine.cpp	2006-09-16 22:35:21 UTC (rev 23898)
@@ -136,13 +136,12 @@
 				in = openTablesFile(filename);
 				readSubroutineBlock(in);
 				closeTablesFile(in);
-				if (getGameType() == GType_FF) {
-					// TODO
-				} else if (getGameType() == GType_SIMON2) {
+				if (getGameType() == GType_SIMON2) {
 					_sound->loadSfxTable(_gameFile, _gameOffsetsPtr[atoi(filename + 6) - 1 + _soundIndexBase]);
-				} else if (getPlatform() == Common::kPlatformWindows) {
+				} else if (getGameType() == GType_SIMON1 && getPlatform() == Common::kPlatformWindows) {
 					memcpy(filename, "SFXXXX", 6);
-					_sound->readSfxFile(filename);
+					if (atoi(filename + 6) != 1 && atoi(filename + 6) != 30)
+						_sound->readSfxFile(filename);
 				}
 
 				alignTableMem();


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