[Scummvm-git-logs] scummvm master -> 7c873e33f7660f81832e2d06b57908594f472045

[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:
7c873e33f7 M4: RIDDLE: After an extra check in the IDB, fix 4 more calls to ws_demand_location in rooms 402 and 403 (no facing)


Commit: 7c873e33f7660f81832e2d06b57908594f472045
    https://github.com/scummvm/scummvm/commit/7c873e33f7660f81832e2d06b57908594f472045
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T09:57:39+01:00

Commit Message:
M4: RIDDLE: After an extra check in the IDB, fix 4 more calls to ws_demand_location in rooms 402 and 403 (no facing)

Changed paths:
    engines/m4/riddle/rooms/section4/room402.cpp
    engines/m4/riddle/rooms/section4/room403.cpp


diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index 199acb7d89b..e069a79ebc1 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -115,10 +115,10 @@ void Room402::init() {
 			ws_demand_facing(_G(my_walker), 11);
 
 			if (!_G(kittyScreaming)) {
-				ws_demand_location(660, 290);
+				ws_demand_location(_G(my_walker), 660, 290);
 				digi_play("402_S03", 1, 255, 19);
 			} else {
-				ws_demand_location(425, 285);
+				ws_demand_location(_G(my_walker), 425, 285);
 				player_set_commands_allowed(true);
 			}
 
diff --git a/engines/m4/riddle/rooms/section4/room403.cpp b/engines/m4/riddle/rooms/section4/room403.cpp
index cc81d367b76..8656cb86c65 100644
--- a/engines/m4/riddle/rooms/section4/room403.cpp
+++ b/engines/m4/riddle/rooms/section4/room403.cpp
@@ -246,10 +246,10 @@ void Room403::init() {
 
 			if (_G(kittyScreaming)) {
 				MoveScreenDelta(-640, 0);
-				ws_demand_location(1110, 322);
+				ws_demand_location(_G(my_walker), 1110, 322);
 				player_set_commands_allowed(true);
 			} else {
-				ws_demand_location(4, 296);
+				ws_demand_location(_G(my_walker), 4, 296);
 				ws_walk(80, 300, nullptr, 300, 3);
 			}
 		}