diff options
| -rw-r--r-- | engines/kyra/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index d201d0fcd3..9be3b910e1 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -408,7 +408,7 @@ int KyraEngine::buttonMenuCallback(Button *caller) { _displayMenu = true; // XXX setLabels - if (_currentCharacter->sceneId == 210) { + if (_currentCharacter->sceneId == 210 && _deathHandler == 0xFF) { snd_playSoundEffect(0x36); return 0; } diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index e2f28cd8b8..0347d2c65e 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -680,7 +680,6 @@ void KyraEngine::mainLoop() { } if (_deathHandler != 0xFF) { - _deathHandler = 0xFF; snd_playWanderScoreViaMap(0, 1); snd_playSoundEffect(49); _screen->hideMouse(); @@ -688,6 +687,7 @@ void KyraEngine::mainLoop() { destroyMouseItem(); _screen->showMouse(); buttonMenuCallback(0); + _deathHandler = 0xFF; } if (_brandonStatusBit & 2) { |