[Scummvm-git-logs] scummvm master -> 6074b243dd9543bfd846c7269376a179eef66cef

[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:
6074b243dd M4: RIDDLE: Fix triggering actions at end of walks


Commit: 6074b243dd9543bfd846c7269376a179eef66cef
    https://github.com/scummvm/scummvm/commit/6074b243dd9543bfd846c7269376a179eef66cef
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-15T20:20:33-07:00

Commit Message:
M4: RIDDLE: Fix triggering actions at end of walks

Changed paths:
    engines/m4/riddle/walker.cpp


diff --git a/engines/m4/riddle/walker.cpp b/engines/m4/riddle/walker.cpp
index 9d357c47230..ac687fab0ff 100644
--- a/engines/m4/riddle/walker.cpp
+++ b/engines/m4/riddle/walker.cpp
@@ -70,8 +70,8 @@ static const int16 SAFARI_SHADOWS_DIRS[6] = {
 };
 
 void Walker::player_walker_callback(frac16 myMessage, machine *sender) {
-	int32 triggerType = _G(globals)[GLB_TEMP_1] >> 16;
-	//int32 subVal = _G(globals)[GLB_TEMP_3] >> 16;
+	int triggerType = _G(globals)[GLB_TEMP_1] >> 16;
+	int subVal = _G(globals)[GLB_TEMP_2] >> 16;
 
 	switch (triggerType) {
 	case 0:
@@ -83,10 +83,12 @@ void Walker::player_walker_callback(frac16 myMessage, machine *sender) {
 		break;
 
 	case 2:
-		if (walker_has_walk_finished(sender))
-			sendWSMessage(0x30000, 0, nullptr, 0, nullptr, 1);
-		else
-			_G(player).waiting_for_walk = false;
+		if (walker_has_walk_finished(sender)) {
+			if (subVal)
+				sendWSMessage(0x30000, 0, sender, 0, nullptr, 1);
+			else
+				_G(player).waiting_for_walk = false;
+		}
 		break;
 
 	case 3: