aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2005-10-23 13:45:20 +0000
committerTravis Howell2005-10-23 13:45:20 +0000
commit5eba9ee36c5f52e2e3fe425403c3ab356e49a79d (patch)
tree8ba0806ec7d4fedcc91ed3e2c19cc5675f11d99f /simon
parentf874a87c903aa89a3ab445a4fe77d11972dea976 (diff)
downloadscummvm-rg350-5eba9ee36c5f52e2e3fe425403c3ab356e49a79d.tar.gz
scummvm-rg350-5eba9ee36c5f52e2e3fe425403c3ab356e49a79d.tar.bz2
scummvm-rg350-5eba9ee36c5f52e2e3fe425403c3ab356e49a79d.zip
Fix no sound effects regression in simon1.
svn-id: r19267
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 8fc32a95db..8126b13876 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1405,9 +1405,9 @@ void SimonEngine::loadTablesIntoMem(uint subr_id) {
readSubroutineBlock(in);
closeTablesFile(in);
- if (_game == GAME_SIMON2DOS || _game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+ if (_game & GF_SIMON2) {
_sound->loadSfxTable(_gameFile, _gameOffsetsPtr[atoi(filename + 6) - 1 + SOUND_INDEX_BASE]);
- } else if (_game == GAME_SIMON1TALKIE) {
+ } else if (_game & GF_TALKIE) {
memcpy(filename, "SFXXXX", 6);
_sound->readSfxFile(filename);
}