[Scummvm-git-logs] scummvm master -> 76e9769ecd7edf681cae97ac065f7b26793b23a9

[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:
76e9769ecd M4: RIDDLE: Hack player_first_walk to fix room 702 entry


Commit: 76e9769ecd7edf681cae97ac065f7b26793b23a9
    https://github.com/scummvm/scummvm/commit/76e9769ecd7edf681cae97ac065f7b26793b23a9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-04T21:45:52-08:00

Commit Message:
M4: RIDDLE: Hack player_first_walk to fix room 702 entry

The original method had code to set Ripley's position,
destination, and flagged that a walk is needed. But the
walk doesn't happen. Not sure why. Rather than spending
a lot of time debugging where the walk gets triggered,
it was simpler just to pass the destination to the
existing ws_walk method, which seems to work fine.

Changed paths:
    engines/m4/adv_r/adv_player.cpp


diff --git a/engines/m4/adv_r/adv_player.cpp b/engines/m4/adv_r/adv_player.cpp
index 71140ef0403..3e106524ea0 100644
--- a/engines/m4/adv_r/adv_player.cpp
+++ b/engines/m4/adv_r/adv_player.cpp
@@ -164,12 +164,9 @@ bool player_load_series(const char *walkerName, const char *shadowName, bool loa
 	return true;
 }
 
-void player_first_walk(int32 x1, int32 y1, int32 /*f1*/, int32 x2, int32 y2, int32 /*f2*/, bool /*enable_commands_at_destination*/) {
-	player_demand_location(x1, y1);
-	_G(player).ready_to_walk = true;
-	_G(player).need_to_walk = true;
-	_G(player).walk_x = x2;
-	_G(player).walk_y = y2;
+void player_first_walk(int32 x1, int32 y1, int32 f1, int32 x2, int32 y2, int32 f2, bool /*enable_commands_at_destination*/) {
+	ws_demand_location(x1, y1, f1);
+	ws_walk(x2, y2, nullptr, -1, f2);
 }
 
 void player_set_defaults() {