[Scummvm-git-logs] scummvm master -> a3f6f73b4960414e1a3ae06ce363a129ef0e5714
Strangerke
noreply at scummvm.org
Mon Dec 16 23:21:25 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:
a3f6f73b49 M4: RIDDLE: Room 707: Finish the implementation (parser)
Commit: a3f6f73b4960414e1a3ae06ce363a129ef0e5714
https://github.com/scummvm/scummvm/commit/a3f6f73b4960414e1a3ae06ce363a129ef0e5714
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-17T00:21:12+01:00
Commit Message:
M4: RIDDLE: Room 707: Finish the implementation (parser)
Changed paths:
engines/m4/riddle/rooms/section7/room707.cpp
engines/m4/riddle/rooms/section7/room707.h
diff --git a/engines/m4/riddle/rooms/section7/room707.cpp b/engines/m4/riddle/rooms/section7/room707.cpp
index 79db16226d8..01ace63bca8 100644
--- a/engines/m4/riddle/rooms/section7/room707.cpp
+++ b/engines/m4/riddle/rooms/section7/room707.cpp
@@ -104,7 +104,292 @@ void Room707::pre_parser() {
}
void Room707::parser() {
- // TODO : Not implemented yet
+ const bool lookFl = player_said_any("look", "look at");
+
+ if (lookFl && player_said("VOTIVE STUPA"))
+ digi_play("707r03", 1, 255, -1, -1);
+ else if (lookFl && player_said("WINDOW")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ setGlobals1(_peerIntoCupolaPos2Series, 1, 13, 13, 13, 0, 13, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ case 2:
+ _popUpMach = series_place_sprite("707 LEFT SLIT POPUP", 0, 0, 0, 100, 256);
+ kernel_timing_trigger(100, 3, nullptr);
+
+ break;
+
+ case 3:
+ digi_play("707r05", 1, 255, 4, -1);
+ break;
+
+ case 4:
+ terminateMachine(_popUpMach);
+ sendWSMessage_120000(_G(my_walker), 5);
+ break;
+
+ case 5:
+ sendWSMessage_150000(_G(my_walker), 6);
+ break;
+
+ case 6:
+ player_set_commands_allowed(true);
+ break;
+
+ default:
+ break;
+ }
+ } // lookFl && player_said("WINDOW")
+
+ else if (lookFl && player_said("WINDOW ")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ setGlobals1(_peerIntoCupolaPos2Series, 1, 13, 13, 13, 0, 13, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ case 2:
+ _popUpMach = series_place_sprite("707 RIGHT SLIT POPUP", 0, 0, 0, 100, 256);
+ kernel_timing_trigger(100, 3, nullptr);
+
+ break;
+
+ case 3:
+ digi_play("707r05", 1, 255, 4, -1);
+ break;
+
+ case 4:
+ terminateMachine(_popUpMach);
+ sendWSMessage_120000(_G(my_walker), 5);
+ break;
+
+ case 5:
+ sendWSMessage_150000(_G(my_walker), 6);
+ break;
+
+ case 6:
+ player_set_commands_allowed(true);
+ break;
+
+ default:
+ break;
+ }
+ } // lookFl && player_said("WINDOW ")
+
+ else if (lookFl && player_said("GRATE")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_update_info(_G(my_walker), &_G(player_info));
+ switch (_G(player_info).facing) {
+ case 1:
+ case 11:
+ _ripLooksDownSeries = series_load("RIP LOOKS DOWN POS1", -1, nullptr);
+ setGlobals1(_ripLooksDownSeries, 1, 14, 14, 14, 0, 14, 29, 29, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ case 2:
+ case 10:
+ _ripLooksDownSeries = series_load("RIP LOOKS DOWN POS2", -1, nullptr);
+ setGlobals1(_ripLooksDownSeries, 1, 14, 14, 14, 0, 14, 29, 29, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ case 3:
+ case 9:
+ _ripLooksDownSeries = series_load("RIP TREK LOOK DOWN POS3", -1, nullptr);
+ setGlobals1(_ripLooksDownSeries, 1, 11, 11, 11, 0, 11, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ case 4:
+ case 8:
+ _ripLooksDownSeries = series_load("RIP LOOKS DOWN POS4", -1, nullptr);
+ setGlobals1(_ripLooksDownSeries, 1, 16, 16, 16, 0, 16, 33, 33, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ case 5:
+ case 7:
+ _ripLooksDownSeries = series_load("RIP LOOKS DOWN POS5", -1, nullptr);
+ setGlobals1(_ripLooksDownSeries, 1, 15, 15, 15, 0, 15, 31, 31, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 2);
+
+ break;
+
+ default:
+ break;
+ }
+
+ break;
+
+ case 2:
+ digi_play(_field44 ? "707r04" : "707r04a", 1, 255, -1, -1);
+ kernel_timing_trigger(10, 3, nullptr);
+
+ break;
+
+ case 3:
+ sendWSMessage_120000(_G(my_walker), 4);
+ break;
+
+ case 4:
+ sendWSMessage_150000(_G(my_walker), 5);
+ break;
+
+ case 5:
+ series_unload(_ripLooksDownSeries);
+ player_set_commands_allowed(true);
+
+ break;
+
+ default:
+ break;
+ }
+ } // lookFl && player_said("GRATE")
+
+ else if (player_said("RM704")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ ws_hide_walker(_G(my_walker));
+ _ripDownStairsPos8Series = series_load("RIP DOWN STAIRS POSITION 8", -1, nullptr);
+ _ripStairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, false, triggerMachineByHashCallback, "rip stairs machine");
+ sendWSMessage_10000(1, _ripStairsMach, _ripDownStairsPos8Series, 4, 27, 2, _ripDownStairsPos8Series, 27, 27, 0);
+
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _ripStairsMach, _ripDownStairsPos8Series, 28, 37, -1, _ripDownStairsPos8Series, 37, 37, 0);
+ disable_player_commands_and_fade_init(3);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripStairsMach);
+ player_set_commands_allowed(true);
+ adv_kill_digi_between_rooms(false);
+ digi_play_loop("950_s39", 3, 255, -1, -1);
+ _G(game).new_room = 704;
+
+ break;
+
+ default:
+ break;
+ }
+ } // player_said("RM704")
+
+ else if (player_said("RM705")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ ws_hide_walker(_G(my_walker));
+ _ripDownStairsPos4Series = series_load("RIP DOWN STAIRS POSITION 4", -1, nullptr);
+ _ripStairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, false, triggerMachineByHashCallback, "rip stairs machine going to rm704");
+ sendWSMessage_10000(1, _ripStairsMach, _ripDownStairsPos4Series, 4, 27, 2, _ripDownStairsPos4Series, 27, 27, 0);
+
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _ripStairsMach, _ripDownStairsPos4Series, 28, 37, -1, _ripDownStairsPos4Series, 37, 37, 0);
+ disable_player_commands_and_fade_init(3);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripStairsMach);
+ player_set_commands_allowed(true);
+ adv_kill_digi_between_rooms(false);
+ digi_play_loop("950_s39", 3, 255, -1, -1);
+ _G(game).new_room = 705;
+
+ break;
+
+ default:
+ break;
+ }
+ } // player_said("RM705")
+
+ else if (player_said("RM703")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ ws_hide_walker(_G(my_walker));
+ _ripWalksDownLeftStairsSeries = series_load("RIP WALKS DOWN LEFT STAIRS", -1, nullptr);
+ _ripStairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, false, triggerMachineByHashCallback, "rip stairs machine going to rm704");
+ sendWSMessage_10000(1, _ripStairsMach, _ripWalksDownLeftStairsSeries, 1, 14, 2, _ripWalksDownLeftStairsSeries, 14, 14, 0);
+
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _ripStairsMach, _ripWalksDownLeftStairsSeries, 15, 19, -1, _ripWalksDownLeftStairsSeries, 19, 19, 0);
+ disable_player_commands_and_fade_init(3);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripStairsMach);
+ player_set_commands_allowed(true);
+ adv_kill_digi_between_rooms(false);
+ digi_play_loop("950_s39", 3, 255, -1, -1);
+ _G(game).new_room = 703;
+
+ break;
+
+ default:
+ break;
+ }
+ } // player_said("RM703")
+
+ else if (player_said("RM706")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ ws_hide_walker(_G(my_walker));
+ _ripWalksDownFarStairsSeries = series_load("RIP WALKS DOWN FAR STAIRS", -1, nullptr);
+ _ripStairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, false, triggerMachineByHashCallback, "rip stairs machine going to rm704");
+ sendWSMessage_10000(1, _ripStairsMach, _ripWalksDownFarStairsSeries, 1, 14, 2, _ripWalksDownFarStairsSeries, 14, 14, 0);
+
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _ripStairsMach, _ripWalksDownFarStairsSeries, 15, 19, -1, _ripWalksDownFarStairsSeries, 19, 19, 0);
+ disable_player_commands_and_fade_init(3);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripStairsMach);
+ player_set_commands_allowed(true);
+ adv_kill_digi_between_rooms(false);
+ digi_play_loop("950_s39", 3, 255, -1, -1);
+ _G(game).new_room = 706;
+
+ break;
+
+ default:
+ break;
+ }
+ } // player_said("RM706")
+
+ else if (lookFl && player_said(" "))
+ digi_play("707r01", 1, 255, -1, -1);
+ else if (player_said("GRATE"))
+ digi_play("707r02", 1, 255, -1, -1);
+ else
+ return;
+
+ _G(player).command_ready = false;
}
void Room707::daemon() {
diff --git a/engines/m4/riddle/rooms/section7/room707.h b/engines/m4/riddle/rooms/section7/room707.h
index 89affe1e64d..569f07461b6 100644
--- a/engines/m4/riddle/rooms/section7/room707.h
+++ b/engines/m4/riddle/rooms/section7/room707.h
@@ -44,11 +44,17 @@ private:
int32 _peerIntoCupolaPos1Series = 0;
int32 _peerIntoCupolaPos2Series = 0;
+ int32 _ripDownStairsPos4Series = 0;
+ int32 _ripDownStairsPos8Series = 0;
+ int32 _ripLooksDownSeries = 0;
int32 _ripUpStairsPos10Series = 0;
int32 _ripUpStairsPos2Series = 0;
+ int32 _ripWalksDownFarStairsSeries = 0;
+ int32 _ripWalksDownLeftStairsSeries = 0;
int32 _ripWalksUpFarStairsSeries = 0;
int32 _ripWalksUpLeftStairsSeries = 0;
+ machine *_popUpMach = nullptr;
machine *_ripStairsMach = nullptr;
};
More information about the Scummvm-git-logs
mailing list