[Scummvm-git-logs] scummvm master -> a916f9f1e279cc9875b4130c1ee2873806bee24f

[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:
a916f9f1e2 M4: RIDDLE: Fix wheel bridge to move when trying to walk over


Commit: a916f9f1e279cc9875b4130c1ee2873806bee24f
    https://github.com/scummvm/scummvm/commit/a916f9f1e279cc9875b4130c1ee2873806bee24f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T16:26:08-08:00

Commit Message:
M4: RIDDLE: Fix wheel bridge to move when trying to walk over

As amusing as it was to have accidentally bypassed the whole
set of puzzles for the room, for completeness I unfortunately
have to fix it.

Changed paths:
    engines/m4/riddle/rooms/section8/room808.cpp


diff --git a/engines/m4/riddle/rooms/section8/room808.cpp b/engines/m4/riddle/rooms/section8/room808.cpp
index 3c45c791651..e92e5d0e98f 100644
--- a/engines/m4/riddle/rooms/section8/room808.cpp
+++ b/engines/m4/riddle/rooms/section8/room808.cpp
@@ -191,9 +191,9 @@ void Room808::pre_parser() {
 		opCode = 3;
 	else if (player_said("go"))
 		opCode = 5;
-	else if (player_said("crank"))
+	else if (!scumm_stricmp(_G(player).verb, "crank"))
 		opCode = 6;
-	else if (player_said("journal"))
+	else if (!scumm_stricmp(_G(player).verb, "journal"))
 		opCode = 11;
 
 	bool doneFl = true;
@@ -255,10 +255,10 @@ void Room808::pre_parser() {
 		return;
 
 	if (_G(flags)[V094] != 0 && _G(flags)[V094] != 4) {
-		_G(player).need_to_walk = false;
-		_G(player).ready_to_walk = true;
-		_G(player).waiting_for_walk = false;
-	} else if (inv_object_in_scene("FARMER'S SHOVEL", 808) && (_G(flags)[V094] == 0 || _G(flags)[V100] == 0)) {
+		_G(player).resetWalk();
+
+	} else if ((inv_object_in_scene("FARMER'S SHOVEL", 808) && _G(flags)[V094] == 0) ||
+			(!inv_object_in_scene("FARMER'S SHOVEL", 808) && _G(flags)[V100] == 0)) {
 		intr_cancel_sentence();
 		_G(kernel).trigger_mode = KT_DAEMON;
 		if (_G(flags)[V096] == 0) {
@@ -273,7 +273,6 @@ void Room808::pre_parser() {
 		ws_walk(_G(my_walker), 274, 142, nullptr, 8, 2, true);
 		_G(kernel).trigger_mode = KT_PREPARSE;
 	}
-
 }
 
 void Room808::parser() {