diff options
| author | Paul Gilbert | 2015-07-01 21:50:32 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-07-01 21:50:32 -0400 |
| commit | 76419173b556a094828160dfe37b944bb10bf9c0 (patch) | |
| tree | ff6b6447953e0b74b252b854639d66be980c64dc /engines/sherlock/talk.cpp | |
| parent | dc4689e4b901971448f2625a96d5708a0c6e8ddf (diff) | |
| download | scummvm-rg350-76419173b556a094828160dfe37b944bb10bf9c0.tar.gz scummvm-rg350-76419173b556a094828160dfe37b944bb10bf9c0.tar.bz2 scummvm-rg350-76419173b556a094828160dfe37b944bb10bf9c0.zip | |
SHERLOCK: RT: Fix infinite empty talk dialog in intro
Diffstat (limited to 'engines/sherlock/talk.cpp')
| -rw-r--r-- | engines/sherlock/talk.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 11ae9b4c1f..abd41b94b9 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -857,7 +857,7 @@ void Talk::doScript(const Common::String &script) { } // Open window if it wasn't already open, and text has already been printed - if ((_openTalkWindow && _wait) || (_openTalkWindow && str[0] >= _opcodes[0] && str[0] != _opcodes[OP_CARRIAGE_RETURN])) { + if ((_openTalkWindow && _wait) || (_openTalkWindow && str[0] >= _opcodes[0] && str[0] != _opcodes[OP_END_TEXT_WINDOW])) { if (!ui._slideWindows) { screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT)); } else { @@ -1128,6 +1128,10 @@ OpcodeReturn Talk::cmdEnableEndKey(const byte *&str) { return RET_SUCCESS; } +OpcodeReturn Talk::cmdEndTextWindow(const byte *&str) { + return RET_SUCCESS; +} + OpcodeReturn Talk::cmdHolmesOff(const byte *&str) { People &people = *_vm->_people; people[HOLMES]._type = REMOVE; |