diff options
| author | Paul Gilbert | 2015-06-07 14:26:57 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-07 14:26:57 -0400 |
| commit | 9b837c308f3175586aaceb273c6d11bfc778fbb1 (patch) | |
| tree | f7218e980bc4a3cefc3498d3f77928158e4a6d20 /engines/sherlock/scalpel/scalpel_talk.cpp | |
| parent | be46bfd1f9eea2d74bb8dfe41841c4bfd9519a5d (diff) | |
| download | scummvm-rg350-9b837c308f3175586aaceb273c6d11bfc778fbb1.tar.gz scummvm-rg350-9b837c308f3175586aaceb273c6d11bfc778fbb1.tar.bz2 scummvm-rg350-9b837c308f3175586aaceb273c6d11bfc778fbb1.zip | |
SHERLOCK: Fix for switching speakers
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_talk.cpp')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 23937decd5..f630534af7 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -492,6 +492,21 @@ OpcodeReturn ScalpelTalk::cmdCarriageReturn(const byte *&str) { return RET_SUCCESS; } +void ScalpelTalk::talkWait(const byte *&str) { + UserInterface &ui = *_vm->_ui; + bool pauseFlag = _pauseFlag; + + Talk::talkWait(str); + + // Clear the window unless the wait was due to a PAUSE command + if (!pauseFlag && _wait != -1 && str < _scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND]) { + if (!_talkStealth) + ui.clearWindow(); + _yp = CONTROLS_Y + 12; + _charCount = _line = 0; + } +} + } // End of namespace Scalpel } // End of namespace Sherlock |