diff options
author | Florian Kagerer | 2009-04-05 11:36:38 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-04-05 11:36:38 +0000 |
commit | bf160a91b83c42ca51b2b48a88b8654d17bab30d (patch) | |
tree | 2c0cc8d03e5eb10615b04dcba2cc393ff35bf499 | |
parent | 5f1c08505f3881b7154cca07731d911fe55b7741 (diff) | |
download | scummvm-rg350-bf160a91b83c42ca51b2b48a88b8654d17bab30d.tar.gz scummvm-rg350-bf160a91b83c42ca51b2b48a88b8654d17bab30d.tar.bz2 scummvm-rg350-bf160a91b83c42ca51b2b48a88b8654d17bab30d.zip |
LOL: fix speech bug, which would cause a hang up when entering roland's house
svn-id: r39858
-rw-r--r-- | engines/kyra/lol.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script_lol.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 97ba9cb9bd..9093c63dc9 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -1522,7 +1522,7 @@ int LoLEngine::snd_characterSpeaking() { return 2; } - return 1; + return 0; } void LoLEngine::snd_stopSpeech(bool setFlag) { diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index 6199a75626..3719081734 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -1372,7 +1372,7 @@ int LoLEngine::olol_characterSays(EMCState *script) { return 1; } - if (stackPos(0) != -1) + if (stackPos(0) != -2) return characterSays(stackPos(0), stackPos(1), stackPos(2)); else return snd_characterSpeaking(); |