diff options
| author | Johannes Schickel | 2006-03-14 14:25:13 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-03-14 14:25:13 +0000 |
| commit | a68e8c2db959363d8ef0b4cd40062e305603fae1 (patch) | |
| tree | 418c32017a10619b5486f067e147a1740e63ca92 | |
| parent | 68bc8ea52e8c527b45e4880dcf683ac062cf0624 (diff) | |
| download | scummvm-rg350-a68e8c2db959363d8ef0b4cd40062e305603fae1.tar.gz scummvm-rg350-a68e8c2db959363d8ef0b4cd40062e305603fae1.tar.bz2 scummvm-rg350-a68e8c2db959363d8ef0b4cd40062e305603fae1.zip | |
Fixes wrong sound then showing the death screen.
svn-id: r21290
| -rw-r--r-- | engines/kyra/kyra.cpp | 5 | ||||
| -rw-r--r-- | engines/kyra/sound.cpp | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index 25b68fab1a..44e288db20 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -676,10 +676,7 @@ void KyraEngine::mainLoop() { if (_deathHandler != 0xFF) { _deathHandler = 0xFF; snd_playWanderScoreViaMap(0, 1); - // This causes a failed assert in playWanderScoreViaMap. - //snd_playSoundEffect(49); - // Playing the track directly instead. - _sound->playTrack(29); + snd_playSoundEffect(49); buttonMenuCallback(0); } diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index bd1c3d464c..1b37c0a768 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -406,11 +406,7 @@ void KyraEngine::snd_playTheme(int file, int track) { void KyraEngine::snd_playSoundEffect(int track) { debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playSoundEffect(%d)", track); - if (track == 49) { - snd_playWanderScoreViaMap(56, 1); - } else { - _sound->playSoundEffect(track); - } + _sound->playSoundEffect(track); } void KyraEngine::snd_playWanderScoreViaMap(int command, int restart) { |