[Scummvm-git-logs] scummvm master -> 0fee5b3ec5c42ba48d7118be437f6849cda719a0

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0fee5b3ec5 SCI: Fix LB2 Yvette/Tut premature murder message


Commit: 0fee5b3ec5c42ba48d7118be437f6849cda719a0
    https://github.com/scummvm/scummvm/commit/0fee5b3ec5c42ba48d7118be437f6849cda719a0
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2018-10-08T02:39:00+03:00

Commit Message:
SCI: Fix LB2 Yvette/Tut premature murder message

Fixes wrong message in floppy versions, bug #10723

Changed paths:
    engines/sci/engine/message.cpp


diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index cbfe72d..3130abb 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) {