[Scummvm-git-logs] scummvm master -> 5a064dfe6e964a59969ae6f0dda35c9771571b3d

Strangerke noreply at scummvm.org
Tue Dec 31 14:57:44 UTC 2024


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:
5a064dfe6e M4: RIDDLE: Room 807: Some more progress on parser


Commit: 5a064dfe6e964a59969ae6f0dda35c9771571b3d
    https://github.com/scummvm/scummvm/commit/5a064dfe6e964a59969ae6f0dda35c9771571b3d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-31T15:57:14+01:00

Commit Message:
M4: RIDDLE: Room 807: Some more progress on parser

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


diff --git a/engines/m4/riddle/rooms/section8/room807.cpp b/engines/m4/riddle/rooms/section8/room807.cpp
index 194d2cd1f4c..9727cb679b9 100644
--- a/engines/m4/riddle/rooms/section8/room807.cpp
+++ b/engines/m4/riddle/rooms/section8/room807.cpp
@@ -378,6 +378,58 @@ void Room807::parser() {
 		break;
 
 	case 2:
+		if (player_said("wooden post")) {
+			// TODO not implemented yet
+		} else if (player_said("crank")) {
+			// TODO not implemented yet
+		} else if (player_said("wooden beam")) {
+			switch (_G(kernel).trigger) {
+			case -1:
+				if (inv_object_in_scene("wooden beam", 807)) {
+					if (inv_object_in_scene("wooden post", 807)) {
+						player_set_commands_allowed(false);
+						setGlobals3(_ripTrekHiReach2HndSeries, 1, 13);
+						subD7916(_G(my_walker), 10);
+					} else {
+						digi_play("807r26", 1, 255, -1, -1);
+					}
+				} else {
+					_G(player).command_ready = true;
+				}
+
+				break;
+
+			case 10:
+				inv_give_to_player("WOODEN BEAM");
+				kernel_examine_inventory_object("PING WOODEN BEAM", _G(master_palette), 5, 1, 170, 135, 15, nullptr, -1);
+
+				break;
+
+			case 15:
+				terminateMachine(_807PostMach);
+				setGlobals3(_ripTrekHiReach2HndSeries, 13, 1);
+				subD7916(_G(my_walker), 20);
+
+				break;
+
+			case 20:
+				player_set_commands_allowed(true);
+				hotspot_set_active(_G(currentSceneDef).hotspots, "wooden beam", false);
+				ws_demand_facing(_G(my_walker), 11);
+
+				break;
+
+			default:
+				break;
+
+			}
+		} else if (player_said_any("chariot", "chariot ")) {
+			digi_play("807r27", 1, 255, -1, -1);
+		} else
+			_G(player).command_ready = true;
+
+		break;
+
 	case 3:
 	case 4:
 	case 5:




More information about the Scummvm-git-logs mailing list