[Scummvm-git-logs] scummvm branch-2-3 -> 3727a4885bb8e080c12d11e81f70e72bd9fa5853

[dreammaster]

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:
3727a4885b SHERLOCK: Flower girl first greeting now interrupts actions


Commit: 3727a4885bb8e080c12d11e81f70e72bd9fa5853
    https://github.com/scummvm/scummvm/commit/3727a4885bb8e080c12d11e81f70e72bd9fa5853
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-28T15:53:17-07:00

Commit Message:
SHERLOCK: Flower girl first greeting now interrupts actions

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 55cf820726..80d7d7bae2 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -187,6 +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
+		_talkToAbort = true;
 	}
 }