[Scummvm-git-logs] scummvm master -> 27d9cd32812c32950098eb062cd9422db94b286c

[bluegr]

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

Summary:
bcb044fa5b SCI: Fix typo
27d9cd3281 SCI32: Fix a crash when talking with the Leshy in QFG4


Commit: bcb044fa5b39d893f7af928295ddc668fe9db62d
    https://github.com/scummvm/scummvm/commit/bcb044fa5b39d893f7af928295ddc668fe9db62d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-08-28T02:03:50+03:00

Commit Message:
SCI: Fix typo

Changed paths:
    engines/sci/sound/soundcmd.cpp


diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index d592dee..8c15a54 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -450,7 +450,7 @@ reg_t SoundCommandParser::kDoSoundFade(EngineState *s, int argc, reg_t *argv) {
 		musicSlot->fadeTicker = 0;
 
 		// argv[4] is a boolean. Scripts sometimes pass strange values,
-		// but SSCI only checks for zero/non-zero. (Verified in KQ6.)
+		// but SSCI only checks for zero/non-zero. (Verified in KQ6).
 		// KQ6 room 460 even passes an object, but treating this as 'true'
 		// seems fine in that case.
 		if (argc == 5)


Commit: 27d9cd32812c32950098eb062cd9422db94b286c
    https://github.com/scummvm/scummvm/commit/27d9cd32812c32950098eb062cd9422db94b286c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-08-28T02:04:46+03:00

Commit Message:
SCI32: Fix a crash when talking with the Leshy in QFG4

Fixes bug #10137

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


diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index d8e2d48..cbfe72d 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -245,6 +245,12 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
 			t.cond = 13;
 		}
 
+		if (g_sci->getGameId() == GID_QFG4 && stack.getModule() == 579 &&
+			t.noun == 0 && t.verb == 0 && t.cond == 0 && t.seq == 1) {
+			// Talking with the Leshy and telling him about "bush in goo" - bug #10137
+			t.verb = 1;
+		}
+
 		// 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) {