[Scummvm-git-logs] scummvm master -> 06621c94d94b01d795ab85d2433c3b3450d7b1b5

[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:
06621c94d9 SHERLOCK: RT: Cancel scene transition when interrupted by script


Commit: 06621c94d94b01d795ab85d2433c3b3450d7b1b5
    https://github.com/scummvm/scummvm/commit/06621c94d94b01d795ab85d2433c3b3450d7b1b5
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-08-17T20:39:01-07:00

Commit Message:
SHERLOCK: RT: Cancel scene transition when interrupted by script

Fixes #14580

Changed paths:
    engines/sherlock/talk.cpp


diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 586e1682e7f..86be0fde152 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -176,8 +176,11 @@ void Talk::talkTo(const Common::String filename) {
 	if (people[HOLMES]._walkCount || (!people[HOLMES]._walkTo.empty() &&
 			(IS_SERRATED_SCALPEL || people._allowWalkAbort))) {
 		// Only interrupt if trying to do an action, and not just if player is walking around the scene
-		if (people._allowWalkAbort)
+		if (people._allowWalkAbort) {
 			abortFlag = true;
+			// an arrow zone might have been clicked before the interrupt, cancel the scene transition
+			ui._exitZone = -1;
+		}
 
 		people[HOLMES].gotoStand();
 	}