aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/scumm.cpp4
-rw-r--r--scumm/sound.cpp3
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();