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

[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:
d198ce341e M4: RIDDLE: Fixes for rigging up hut


Commit: d198ce341e4cb8fdc06bc243d2ed25674b17aab3
    https://github.com/scummvm/scummvm/commit/d198ce341e4cb8fdc06bc243d2ed25674b17aab3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-29T22:25:10-08:00

Commit Message:
M4: RIDDLE: Fixes for rigging up hut

Changed paths:
    engines/m4/riddle/gui/interface.cpp
    engines/m4/riddle/rooms/section6/room604.cpp


diff --git a/engines/m4/riddle/gui/interface.cpp b/engines/m4/riddle/gui/interface.cpp
index 176e082c439..c071d43a5bb 100644
--- a/engines/m4/riddle/gui/interface.cpp
+++ b/engines/m4/riddle/gui/interface.cpp
@@ -117,12 +117,15 @@ void Interface::cancel_sentence() {
 }
 
 void Interface::freshen_sentence() {
+	Common::strcpy_s(_verbText, _nounText);
+	_nounText[0] = '\0';
+
 	_textField->set_string(" ");
+	_iconSelected = true;
+	_G(player).waiting_for_walk = false;
+	_G(player).ready_to_walk = false;
 	_G(player).need_to_walk = false;
-	_G(player).ready_to_walk = _G(player).need_to_walk;
-	_G(player).command_ready = _G(player).ready_to_walk;
-	_prepText[0] = '\0';
-	_nounText[0] = '\0';
+	_G(player).command_ready = false;
 
 	track_hotspots_refresh();
 }
diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index cb4ff746d06..376667a6f3c 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -499,6 +499,21 @@ void Room604::parser() {
 				if (player_said("LIGHTER"))
 					kernel_timing_trigger(40, 3);
 				break;
+			case 2:
+				_flame = series_play("FLAME ON FLOOR", 0xd00, 4, -1, 5, -1, 100, 0, 0, 0, 7);
+				hotspot_set_active("LIGHTER", true);
+				inv_move_object("LIGHTER", 604);
+				inv_move_object("LIT LIGHTER", NOWHERE);
+				sendWSMessage_140000(5);
+				break;
+			case 3:
+				digi_play("604_s01", 2);
+				break;
+			case 5:
+				player_set_commands_allowed(true);
+				break;
+			default:
+				break;
 			}
 		} else {
 			digi_play("com118", 1, 255, -1, 997);
@@ -608,6 +623,7 @@ void Room604::parser() {
 			hotspot_set_active("WIRE ", true);
 			kernel_load_variant("604lock1");
 			digi_play("604r48", 1);
+			player_set_commands_allowed(true);
 			break;
 		default:
 			break;
@@ -1120,6 +1136,7 @@ void Room604::pullCordPlug() {
 
 	case 5:
 		sendWSMessage_150000(-1);
+		player_set_commands_allowed(true);
 		break;
 
 	default: