[Scummvm-git-logs] scummvm branch-2-5 -> 24e40b8bce47acf013dbf0d33bc7a55df4954055

[eriktorbjorn]

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

Summary:
1405fc6b9a SHERLOCK: Fix Scalpel UI glitch (bug #13195)
db82a796e7 SHERLOCK: Extend Scalpel flower girl workaround
24e40b8bce SHERLOCK: Mention Sherlock fixes


Commit: 1405fc6b9a8737e8ce830fcff52fc955af0ba706
    https://github.com/scummvm/scummvm/commit/1405fc6b9a8737e8ce830fcff52fc955af0ba706
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-14T16:48:12+01:00

Commit Message:
SHERLOCK: Fix Scalpel UI glitch (bug #13195)

This would happen when examining certain room objects (ones where
printing the description was part of a custom animation) while the
inventory was open. This was a bug in the original interpreter as well.

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp


diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 837c7fa1844..32b0d40da07 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -534,6 +534,13 @@ void ScalpelUserInterface::examine() {
 	Talk &talk = *_vm->_talk;
 	Common::Point pt = events.mousePos();
 
+	if (_invLookFlag) {
+		// Don't close the inventory window when starting an examine display, since its
+		// window will slide up to replace the inventory display
+		_windowOpen = false;
+		_menuMode = LOOK_MODE;
+	}
+
 	if (pt.y < (CONTROLS_Y + 9)) {
 		Object &obj = scene._bgShapes[_bgFound];
 
@@ -561,13 +568,6 @@ void ScalpelUserInterface::examine() {
 			_vm->setFlags(inv[_selector]._lookFlag);
 	}
 
-	if (_invLookFlag) {
-		// Don't close the inventory window when starting an examine display, since its
-		// window will slide up to replace the inventory display
-		_windowOpen = false;
-		_menuMode = LOOK_MODE;
-	}
-
 	if (!talk._talkToAbort) {
 		if (!scene._cAnimFramePause)
 			printObjectDesc(_cAnimStr, true);


Commit: db82a796e7396232e47972e3d72667a359177c98
    https://github.com/scummvm/scummvm/commit/db82a796e7396232e47972e3d72667a359177c98
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-14T16:48:24+01:00

Commit Message:
SHERLOCK: Extend Scalpel flower girl workaround

The same glitch that happens with the flower girl also happens with the
housekeeper: Walking nearby triggers a conversation, but doesn't abort
the current action. This can cause the UI to get corrupted.

At least for the housekeeper, this does not happen with the original
interpreter. I have no idea why.

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.cpp


diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index d581081a009..4224338b312 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -187,10 +187,11 @@ void ScalpelTalk::talkTo(const Common::String filename) {
 		// WORKAROUND: Original game bug causes the results of testing the powdery substance
 		// to disappear too quickly. Introduce a delay to allow it to be properly displayed
 		ui._menuCounter = 30;
-	} else if (filename == "Lesl24z.tlk") {
-		// WORKAROUND: Walking to the flower girl the first time triggers
-		// this automatic talk. This should abort any other action, such
-		// as trying to look at her, else the UI gets corrupted
+	} else if (filename == "Lesl24z.tlk" || filename == "Beal40y.tlk") {
+		// WORKAROUND: Walking to the flower girl or housekeeper the
+		// first time triggers this automatic talk. This should abort
+		// any other action, such as trying to look at her, else the UI
+		// gets corrupted
 		_talkToAbort = true;
 	}
 }


Commit: 24e40b8bce47acf013dbf0d33bc7a55df4954055
    https://github.com/scummvm/scummvm/commit/24e40b8bce47acf013dbf0d33bc7a55df4954055
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-14T16:48:58+01:00

Commit Message:
SHERLOCK: Mention Sherlock fixes

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 604fcf23b5d..09f494aeff1 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  Sherlock:
    - Fixed slowdown in Serrated Scalpel intro when playing the game from a small
      installation.
+   - Fixed UI glitches in Serrated Scalpel.
 
 #### 2.5.1 (2022-01-02)