[Scummvm-git-logs] scummvm master -> 37f655fcf9148f3edd3b20c20843dafc95709b4d

[Strangerke]

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:
37f655fcf9 M4: RIDDLE: Fix some calls to ws_demand_facing in riddle's rooms


Commit: 37f655fcf9148f3edd3b20c20843dafc95709b4d
    https://github.com/scummvm/scummvm/commit/37f655fcf9148f3edd3b20c20843dafc95709b4d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T08:42:41+01:00

Commit Message:
M4: RIDDLE: Fix some calls to ws_demand_facing in riddle's rooms

Changed paths:
    engines/m4/riddle/rooms/section2/room203.cpp
    engines/m4/riddle/rooms/section3/room301.cpp
    engines/m4/riddle/rooms/section3/room305.cpp
    engines/m4/riddle/rooms/section4/room402.cpp
    engines/m4/riddle/rooms/section4/room403.cpp
    engines/m4/riddle/rooms/section4/room406.cpp
    engines/m4/riddle/rooms/section4/room407.cpp
    engines/m4/riddle/rooms/section6/room603.cpp


diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index f14343c376a..eba1e7e0a65 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -2357,7 +2357,7 @@ void Room203::daemon() {
 
 	case 358:
 		sendWSMessage_150000(_official, -1);
-		ws_demand_facing(11);
+		ws_demand_facing(_G(my_walker), 11);
 		sendWSMessage_10000(_official, 1025, 290, 11, 359, 1);
 		break;
 
@@ -2386,7 +2386,7 @@ void Room203::daemon() {
 
 	case 365:
 		sendWSMessage_150000(_official, -1);
-		ws_demand_facing(7);
+		ws_demand_facing(_G(my_walker), 7);
 		sendWSMessage_10000(_official, 1010, 345, 9, 366, 1);
 		break;
 
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index 7de31043027..0157917a543 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -730,7 +730,7 @@ void Room301::daemon() {
 		break;
 
 	case 208:
-		ws_demand_facing(3);
+		ws_demand_facing(_G(my_walker), 3);
 		kernel_timing_trigger(1, 209);
 		break;
 
diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 799cbbe7640..6e9219cd796 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -174,7 +174,7 @@ void Room305::init() {
 		}
 
 		if (_drawerOpen) {
-			ws_demand_facing(11);
+			ws_demand_facing(_G(my_walker), 11);
 			player_update_info();
 
 			if (_G(flags)[V000]) {
diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index 718eb03cf9d..2fb449a697d 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -112,7 +112,7 @@ void Room402::init() {
 				_wolfClipping, 10, 10, 0);
 			_wolfMode = 2001;
 			_wolfShould = 2300;
-			ws_demand_facing(11);
+			ws_demand_facing(_G(my_walker), 11);
 
 			if (!_G(kittyScreaming)) {
 				ws_demand_location(660, 290);
diff --git a/engines/m4/riddle/rooms/section4/room403.cpp b/engines/m4/riddle/rooms/section4/room403.cpp
index f2907074c28..61d40829a10 100644
--- a/engines/m4/riddle/rooms/section4/room403.cpp
+++ b/engines/m4/riddle/rooms/section4/room403.cpp
@@ -167,7 +167,7 @@ void Room403::init() {
 			}
 
 			if (_ladderMode) {
-				ws_demand_facing(11);
+				ws_demand_facing(_G(my_walker), 11);
 				ws_hide_walker();
 				_ripOnLadder = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
 					triggerMachineByHashCallback, "RIP on ladder/plank");
diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index 0688ec77ff8..6dea2633bf7 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -142,7 +142,7 @@ void Room406::init() {
 		hotspot_set_active("ENVELOPE", false);
 		hotspot_set_active("KEYS", false);
 	} else if (deskDrawerState == 1000) {
-		ws_demand_facing(1);
+		ws_demand_facing(_G(my_walker), 1);
 		_rptmhr = series_load("RPTMHR11");
 		setGlobals1(_rptmhr, 1, 5, 5, 5, 0, 5, 1, 1, 1);
 		sendWSMessage_110000(-1);
@@ -166,7 +166,7 @@ void Room406::init() {
 			hotspot_set_active("KEYS", true);
 		}
 	} else if (_gamesDrawerState == 1000) {
-		ws_demand_facing(11);
+		ws_demand_facing(_G(my_walker), 11);
 		_ripReachHand = series_load("RIP TREK MED REACH HAND POS1");
 		setGlobals1(_ripReachHand, 1, 10, 10, 10, 0, 10, 1, 1, 1);
 		sendWSMessage_110000(-1);
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index 22237d05fba..dd6196d7992 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -85,7 +85,7 @@ void Room407::init() {
 
 	if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
 		if (_drawerState == 1010) {
-			ws_demand_facing(9);
+			ws_demand_facing(_G(my_walker), 9);
 			_ripMedReach = series_load("RIP TREK MED REACH POS3");
 			setGlobals1(_ripMedReach, 10, 10, 10, 10, 0, 10, 1, 1, 1);
 			sendWSMessage_110000(-1);
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index 5640cb5a42d..cbfadc1082f 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -801,7 +801,7 @@ void Room603::daemon() {
 		terminateMachineAndNull(_ttNote);
 		terminateMachineAndNull(_shadow);
 		ws_unhide_walker();
-		ws_demand_facing(4);
+		ws_demand_facing(_G(my_walker), 4);
 		ws_walk(345, 300, nullptr, -1, 10);
 		break;