diff options
author | Gregory Montoir | 2004-01-20 22:35:53 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-01-20 22:35:53 +0000 |
commit | 15a5fd20a3e3d7328512fe64102ed75f3c50fc87 (patch) | |
tree | a547fa590aa4d62d8aebba281a83083e1c7cca7e /queen/talk.cpp | |
parent | ff43b1f8d52412441123d70f18309a6770976f7c (diff) | |
download | scummvm-rg350-15a5fd20a3e3d7328512fe64102ed75f3c50fc87.tar.gz scummvm-rg350-15a5fd20a3e3d7328512fe64102ed75f3c50fc87.tar.bz2 scummvm-rg350-15a5fd20a3e3d7328512fe64102ed75f3c50fc87.zip |
fix 'conversation options still displayed after hitting esc' bug (noticeable in plane when speaking to Sparky)
svn-id: r12565
Diffstat (limited to 'queen/talk.cpp')
-rw-r--r-- | queen/talk.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index ef9a4e2190..1b5b4c00e9 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -312,19 +312,19 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) { if (_vm->logic()->gameState(cutawayGameState) == cutawayTestValue) { getString(ptr, cutawayFilename, 20); - - //CR 2 - 7/3/95, If we're executing a cutaway scene, then make sure - // Joe can talk, so set TALKQUIT to 0 just in case we exit on the - // line that set's the cutaway game states. - _vm->input()->talkQuitReset(); + if (cutawayFilename[0]) { + //CR 2 - 7/3/95, If we're executing a cutaway scene, then make sure + // Joe can talk, so set TALKQUIT to 0 just in case we exit on the + // line that set's the cutaway game states. + _vm->input()->talkQuitReset(); + } } - if (_vm->input()->talkQuit()) { if (_oldSelectedSentenceIndex > 0) selectedValue(_oldSelectedSentenceIndex, _oldSelectedSentenceValue); _vm->input()->talkQuitReset(); _vm->display()->clearTexts(0, 198); - speak(_talkString[15], NULL, "JOE0015"); + _vm->logic()->makeJoeSpeak(15, false); } else { setHasTalkedTo(); |