diff options
| -rw-r--r-- | engines/simon/sound.cpp | 3 | ||||
| -rw-r--r-- | engines/simon/subroutine.cpp | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/engines/simon/sound.cpp b/engines/simon/sound.cpp index 80099aae9b..52ad6ccdfc 100644 --- a/engines/simon/sound.cpp +++ b/engines/simon/sound.cpp @@ -427,8 +427,7 @@ void Sound::readSfxFile(const char *filename) { 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; diff --git a/engines/simon/subroutine.cpp b/engines/simon/subroutine.cpp index 8a2b731422..3587fa4a0b 100644 --- a/engines/simon/subroutine.cpp +++ b/engines/simon/subroutine.cpp @@ -136,13 +136,12 @@ void SimonEngine::loadTablesIntoMem(uint subr_id) { 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(); |