diff options
| author | Travis Howell | 2007-02-19 09:46:45 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-02-19 09:46:45 +0000 |
| commit | abd20d59fab7cdcfaa3998484c91ff8927ce091c (patch) | |
| tree | c6437e133835a1e1d08164ea128b86a19ca55761 /engines/scumm | |
| parent | 402e364852a915e6aa7e9cd2907b3171e83c41f3 (diff) | |
| download | scummvm-rg350-abd20d59fab7cdcfaa3998484c91ff8927ce091c.tar.gz scummvm-rg350-abd20d59fab7cdcfaa3998484c91ff8927ce091c.tar.bz2 scummvm-rg350-abd20d59fab7cdcfaa3998484c91ff8927ce091c.zip | |
Move SCUMM version checks for settings up monst.er.sou file, to higher level.
svn-id: r25716
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/scumm.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index c3e7d9ef45..04ba1d27a8 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1088,7 +1088,7 @@ int ScummEngine::init() { _imuse->setBase(_res->address[rtSound]); } - if (_game.version >= 5) + if (_game.version >= 5 && _game.version <= 7) _sound->setupSound(); updateSoundSettings(); @@ -2150,7 +2150,7 @@ void ScummEngine::restart() { } // Reinit sound engine - if (_game.version >= 5) + if (_game.version >= 5 && _game.version <= 7) _sound->setupSound(); // Re-run bootscript diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index ca9736bf57..fd94ea9b20 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -934,7 +934,7 @@ BaseScummFile *Sound::openSfxFile() { if (file->open(tmp) && _vm->_game.heversion <= 73) file->setEnc(0x69); _soundMode = kVOCMode; - } else if (_vm->_game.version >= 5 && _vm->_game.version <= 7) { + } else { for (uint j = 0; j < 2 && !file->isOpen(); ++j) { for (int i = 0; extensions[i].ext; ++i) { tmp = basename[j] + extensions[i].ext; |