diff options
| author | Jonathan Gray | 2005-09-14 10:49:53 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-09-14 10:49:53 +0000 |
| commit | a5b1a8a2b5ce723277e04948ebe986c11f8023a6 (patch) | |
| tree | fa4ae1425edfa809ba01a5c0c9ec674181beb01c /scumm | |
| parent | 2b9bf456de24195e2c5431bcba8ee1cc992e57c2 (diff) | |
| download | scummvm-rg350-a5b1a8a2b5ce723277e04948ebe986c11f8023a6.tar.gz scummvm-rg350-a5b1a8a2b5ce723277e04948ebe986c11f8023a6.tar.bz2 scummvm-rg350-a5b1a8a2b5ce723277e04948ebe986c11f8023a6.zip | |
Move the check for >= v5 further up the calling chain
for deciding whether we want to open an sfxfile.
svn-id: r18823
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.cpp | 4 | ||||
| -rw-r--r-- | scumm/sound.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 5243881736..61d4c8ad9c 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1699,9 +1699,7 @@ int ScummEngine::init(GameDetector &detector) { _imuse->setBase(res.address[rtSound]); } - // Since MM NES and C64 targets substitute whole file class we get monster.sou file - // name badly generated, so avoid even attempts to open it - if (!((_platform == Common::kPlatformNES) || (_platform == Common::kPlatformC64))) + if (_version >= 5) _sound->setupSound(); // Create debugger diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 0ef964bc27..984aca6f07 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1075,8 +1075,7 @@ void Sound::talkSound(uint32 a, uint32 b, int mode, int channel) { void Sound::setupSound() { delete _sfxFile; - if (_vm->_version >= 5) - _sfxFile = openSfxFile(); + _sfxFile = openSfxFile(); if (_vm->_heversion >= 70) { setupHEMusicFile(); |