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/journal.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/journal.cpp')
| -rw-r--r-- | engines/sherlock/journal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp index bcac69f683..6a4347ae04 100644 --- a/engines/sherlock/journal.cpp +++ b/engines/sherlock/journal.cpp @@ -547,7 +547,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) { replyP += (*replyP & 127) + 1; } else if (c == opcodes[OP_GOTO_SCENE]) { replyP += 5; - } else if (c == opcodes[OP_CARRIAGE_RETURN]) { + } else if (c == opcodes[OP_END_TEXT_WINDOW]) { journalString += "\n"; } } else { @@ -632,7 +632,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) { // Put a space in the output for a control character, unless it's // immediately coming after another control character - if (ctrlSpace && c != opcodes[OP_ASSIGN_PORTRAIT_LOCATION] && c != opcodes[OP_CARRIAGE_RETURN] && + if (ctrlSpace && c != opcodes[OP_ASSIGN_PORTRAIT_LOCATION] && c != opcodes[OP_END_TEXT_WINDOW] && !commentJustPrinted) { journalString += " "; ctrlSpace = false; |