diff options
| author | Oystein Eftevaag | 2006-03-19 08:35:43 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-03-19 08:35:43 +0000 |
| commit | 3e9246331ecdcb1c2c5f51178a2eb18424cbe8aa (patch) | |
| tree | 1c349d0e1f7ad10697e49cbb2ee3c652735007dd | |
| parent | d34d6b17dfc72a1f2f15ce24d5ae12240809afea (diff) | |
| download | scummvm-rg350-3e9246331ecdcb1c2c5f51178a2eb18424cbe8aa.tar.gz scummvm-rg350-3e9246331ecdcb1c2c5f51178a2eb18424cbe8aa.tar.bz2 scummvm-rg350-3e9246331ecdcb1c2c5f51178a2eb18424cbe8aa.zip | |
Makes sure Brandon actually dies when he turns to stone in the kyragem room
svn-id: r21379
| -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) { |