thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move SCUMM version checks for settings up monst.er.sou file, to higher level.

Browse source 
svn-id: r25716
This commit is contained in:
Travis Howell 2007-02-19 09:46:45 +00:00
parent 402e364852
commit abd20d59fa
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/scumm.cpp
View file

@ -1088,7 +1088,7 @@ int ScummEngine::init() {
_imuse->setBase(_res->address[rtSound]); _imuse->setBase(_res->address[rtSound]);
} }
if (_game.version >= 5) if (_game.version >= 5 && _game.version <= 7)
_sound->setupSound(); _sound->setupSound();
updateSoundSettings(); updateSoundSettings();
@ -2150,7 +2150,7 @@ void ScummEngine::restart() {
} }
// Reinit sound engine // Reinit sound engine
if (_game.version >= 5) if (_game.version >= 5 && _game.version <= 7)
_sound->setupSound(); _sound->setupSound();
// Re-run bootscript // Re-run bootscript

2
engines/scumm/sound.cpp
View file

@ -934,7 +934,7 @@ BaseScummFile *Sound::openSfxFile() {
if (file->open(tmp) && _vm->_game.heversion <= 73) if (file->open(tmp) && _vm->_game.heversion <= 73)
file->setEnc(0x69); file->setEnc(0x69);
_soundMode = kVOCMode; _soundMode = kVOCMode;
} else if (_vm->_game.version >= 5 && _vm->_game.version <= 7) { } else {
for (uint j = 0; j < 2 && !file->isOpen(); ++j) { for (uint j = 0; j < 2 && !file->isOpen(); ++j) {
for (int i = 0; extensions[i].ext; ++i) { for (int i = 0; extensions[i].ext; ++i) {
tmp = basename[j] + extensions[i].ext; tmp = basename[j] + extensions[i].ext;