diff options
| author | sluicebox | 2018-09-30 19:59:36 -0700 |
|---|---|---|
| committer | Filippos Karapetis | 2018-10-08 02:39:00 +0300 |
| commit | 0fee5b3ec5c42ba48d7118be437f6849cda719a0 (patch) | |
| tree | 69993cead2cba34b8bd6e157b2ecfd4b6f7a1992 /engines/sci/engine/message.cpp | |
| parent | f7b349ae660f7770e490a6690d9750334d33e619 (diff) | |
| download | scummvm-rg350-0fee5b3ec5c42ba48d7118be437f6849cda719a0.tar.gz scummvm-rg350-0fee5b3ec5c42ba48d7118be437f6849cda719a0.tar.bz2 scummvm-rg350-0fee5b3ec5c42ba48d7118be437f6849cda719a0.zip | |
SCI: Fix LB2 Yvette/Tut premature murder message
Fixes wrong message in floppy versions, bug #10723
Diffstat (limited to 'engines/sci/engine/message.cpp')
| -rw-r--r-- | engines/sci/engine/message.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp index cbfe72d87d..3130abbb7d 100644 --- a/engines/sci/engine/message.cpp +++ b/engines/sci/engine/message.cpp @@ -24,6 +24,7 @@ #include "sci/engine/message.h" #include "sci/engine/kernel.h" #include "sci/engine/seg_manager.h" +#include "sci/engine/state.h" #include "sci/util.h" namespace Sci { @@ -251,6 +252,18 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re t.verb = 1; } + if (g_sci->getGameId() == GID_LAURABOW2 && !g_sci->isCD() && stack.getModule() == 1885 && + t.noun == 1 && t.verb == 6 && t.cond == 16 && t.seq == 4 && + (g_sci->getEngineState()->currentRoomNumber() == 350 || + g_sci->getEngineState()->currentRoomNumber() == 360 || + g_sci->getEngineState()->currentRoomNumber() == 370)) { + // Asking Yvette about Tut in act 2 party - bug #10723 + // Skip the last two lines of dialogue about a murder that hasn't occurred yet. + // Sierra fixed this in cd version by creating a copy of this message without those lines. + // Room-specific as the message is used again later where it should display in full. + t.seq += 2; + } + // Fill in known missing message tuples if (g_sci->getGameId() == GID_SQ4 && stack.getModule() == 16 && t.noun == 7 && t.verb == 0 && t.cond == 3 && t.seq == 1) { |