diff options
| author | Johannes Schickel | 2007-03-24 00:04:08 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2007-03-24 00:04:08 +0000 |
| commit | d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296 (patch) | |
| tree | a4992d087358d688271f4b92083bb0ca09e5261c /engines/kyra/sound.cpp | |
| parent | c8c3dd04a780a106905cc9582058099a7ead343f (diff) | |
| download | scummvm-rg350-d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296.tar.gz scummvm-rg350-d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296.tar.bz2 scummvm-rg350-d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296.zip | |
Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
Diffstat (limited to 'engines/kyra/sound.cpp')
| -rw-r--r-- | engines/kyra/sound.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 9463e1e933..ad0933464f 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -37,7 +37,7 @@ namespace Kyra { Sound::Sound(KyraEngine *engine, Audio::Mixer *mixer) : _engine(engine), _mixer(mixer), _currentVocFile(0), _vocHandle(), _compressHandle(), - _musicEnabled(true), _sfxEnabled(true), _soundFileList(0), _soundFileListSize(0) { + _musicEnabled(1), _sfxEnabled(true), _soundFileList(0), _soundFileListSize(0) { } Sound::~Sound() { @@ -450,14 +450,9 @@ void KyraEngine::snd_playTheme(int file, int track) { void KyraEngine::snd_playSoundEffect(int track) { debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playSoundEffect(%d)", track); - if (_flags.platform == Common::kPlatformFMTowns) { - if (track == 49) { - snd_playWanderScoreViaMap(56, 1); - return; - } else if (track == 0 || track == 1 || track == 10) { - // I don't know what's supposed to happen here, but calling playSoundEffect will lead to crash - return; - } + if (_flags.platform == Common::kPlatformFMTowns && track == 49) { + snd_playWanderScoreViaMap(56, 1); + return; } _sound->playSoundEffect(track); } |