[Scummvm-git-logs] scummvm master -> df5b19e2b814b84f77f649ef366eadd972257227
Strangerke
noreply at scummvm.org
Thu Dec 26 14:07:18 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:
df5b19e2b8 M4: RIDDLE: Room 710: Start working on parser
Commit: df5b19e2b814b84f77f649ef366eadd972257227
https://github.com/scummvm/scummvm/commit/df5b19e2b814b84f77f649ef366eadd972257227
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-26T15:07:06+01:00
Commit Message:
M4: RIDDLE: Room 710: Start working on parser
Changed paths:
engines/m4/riddle/rooms/section7/room710.cpp
engines/m4/riddle/rooms/section7/room710.h
diff --git a/engines/m4/riddle/rooms/section7/room710.cpp b/engines/m4/riddle/rooms/section7/room710.cpp
index 1c31d463a62..68a73ba17fc 100644
--- a/engines/m4/riddle/rooms/section7/room710.cpp
+++ b/engines/m4/riddle/rooms/section7/room710.cpp
@@ -135,7 +135,206 @@ void Room710::pre_parser() {
}
void Room710::parser() {
+ bool ecx = player_said_any("look", "look at");
+ bool edi = player_said_any("talk", "talk to", "take");
+ bool esi = player_said_any("push", "pull", "gear", "open", "close");
+
+ if (edi && player_said("LADDER")) {
+ digi_play("710R09", 1, 255, -1, -1);
+ } else if (edi && player_said("LADDER ")) {
+ digi_play(_field1C ? "710R09" : "710R10", 1, 255, -1, -1);
+ } else if (edi && player_said("ROPE")) {
+ digi_play("710R08", 1, 255, -1, -1);
+ } else if (ecx && player_said_any("LADDER", "LADDER ")) {
+ player_set_commands_allowed(false);
+
+ if (_field1C) {
+ digi_play("710R21", 1, 255, -1, -1);
+ } else if (_G(flags[V030] == 0)) {
+ digi_play("710R02", 1, 255, -1, -1);
+ } else {
+ switch (_G(kernel).trigger) {
+ case -1:
+ digi_play("710R02", 1, 255, 2, -1);
+ break;
+
+ case 2:
+ digi_play("710R03", 1, 255, -1, -1);
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ player_set_commands_allowed(true);
+ } // ecx && player_said_any("LADDER", "LADDER ")
+
+ else if (ecx && player_said("Rope")) {
+ player_set_commands_allowed(false);
+ digi_play("710R04", 1, 255, -1, -1);
+ player_set_commands_allowed(true);
+ } else if (ecx && player_said("Mooring") && _field1C) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ digi_play("710R05", 1, 255, 2, -1);
+
+ break;
+
+ case 2:
+ digi_play("710R07", 1, 255, -1, -1);
+ player_set_commands_allowed(true);
+
+ break;
+
+ default:
+ break;
+ }
+ } // ecx && player_said("Mooring") && _field1C
+
+ else if (ecx && player_said("MOORING")) {
+ player_set_commands_allowed(false);
+ digi_play("710R05", 1, 255, -1, -1);
+ player_set_commands_allowed(true);
+ } else if (ecx && player_said("MACHINERY")) {
+ player_set_commands_allowed(false);
+ digi_play("710R06", 1, 255, -1, -1);
+ player_set_commands_allowed(true);
+ } else if (ecx && player_said(" ")) {
+ player_set_commands_allowed(false);
+ digi_play(_field1C ? "710R20" : "710R01", 1, 255, -1, -1);
+ player_set_commands_allowed(true);
+ } else if (esi && player_said("Rope")) {
+ if (_G(flags[V223])) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ player_update_info(_G(my_walker), &_G(player_info));
+ ws_hide_walker(_G(my_walker));
+ _safariShadow1Mach = series_place_sprite("SAFARI SHADOW 1", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
+ _ripPullsKeyropeMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 3840, false, triggerMachineByHashCallback, "rip pulls keyrope machine");
+ sendWSMessage_10000(1, _ripPullsKeyropeMach, _ripPullsRopeForLaderSeries, 1, 15, 1, _ripPullsRopeForLaderSeries, 15, 15, 0);
+
+ break;
+
+ case 1:
+ sendWSMessage_10000(1, _ripPullsKeyropeMach, _ripPullsRopeForLaderSeries, 16, 21, 21, _ripPullsRopeForLaderSeries, 21, 21, 0);
+ digi_play("710_s03a", 2, 255, -1, -1);
+ kernel_timing_trigger(10, 2, nullptr);
+
+ break;
+
+ case 2:
+ hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", false);
+ _field1C = 0;
+
+ terminateMachine(_710Rpld4Mach);
+ terminateMachine(_710Rpld5Mach);
+
+ _ripContractionMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 1541, false, triggerMachineByHashCallback, "rip contraption machine");
+ sendWSMessage_10000(1, _ripContractionMach02, _laderComesDownSeries, 47, 37, 31, _laderComesDownSeries, 37, 37, 0);
+ digi_play("710_s01", 1, 255, -1, -1);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripContractionMach02);
+ _710Rpld4Mach = series_place_sprite("710rpld3", 0, 0, -53, 100, 3840);
+ _G(flags[V223]) = 0;
+ player_set_commands_allowed(true);
+
+ break;
+
+ case 21:
+ sendWSMessage_10000(1, _ripPullsKeyropeMach, _ripPullsRopeForLaderSeries, 22, 44, 22, _ripPullsRopeForLaderSeries, 44, 44, 0);
+ break;
+
+ case 22:
+ terminateMachine(_ripPullsKeyropeMach);
+ _710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 3840);
+ terminateMachine(_safariShadow1Mach);
+ ws_unhide_walker(_G(my_walker));
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, -1, 5, true);
+
+ break;
+
+ case 31:
+ sendWSMessage_10000(1, _ripContractionMach02, _laderComesDownSeries, 36, 1, 3, _laderComesDownSeries, 1, 1, 0);
+ break;
+
+ default:
+ break;
+ }
+ } else {
+ _field1C = 1;
+
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ player_update_info(_G(my_walker), &_G(player_info));
+ _safariShadow1Mach = series_place_sprite("SAFARI SHADOW 1", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
+ ws_hide_walker(_G(my_walker));
+ hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", true);
+ terminateMachine(_710Rpld5Mach);
+ _ripPullsKeyropeMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 3840, false, triggerMachineByHashCallback, "rip pulls keyrope machine");
+ sendWSMessage_10000(1, _ripPullsKeyropeMach, _ripPullsRopeForLaderSeries, 1, 15, 1, _ripPullsRopeForLaderSeries, 15, 15, 0);
+
+ break;
+
+ case 1:
+ digi_play("710_s03", 2, 255, -1, -1);
+ sendWSMessage_10000(1, _ripPullsKeyropeMach, _ripPullsRopeForLaderSeries, 16, 21, 2, _ripPullsRopeForLaderSeries, 21, 21, 0);
+
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _ripPullsKeyropeMach, _ripPullsRopeForLaderSeries, 22, 44, 21, _ripPullsRopeForLaderSeries, 44, 44, 0);
+ kernel_timing_trigger(10, 22, nullptr);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripContractionMach02);
+ _710Rpld4Mach = series_place_sprite("710rpld4", 0, 0, -53, 100, 1541);
+ _G(flags[V223]) = 1;
+ player_set_commands_allowed(true);
+ digi_play("710r07", 1, 255, -1, -1);
+
+ break;
+
+ case 21:
+ terminateMachine(_ripPullsKeyropeMach);
+ _710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 3840);
+ terminateMachine(_safariShadow1Mach);
+ ws_unhide_walker(_G(my_walker));
+ player_update_info(_G(my_walker), &_G(player_info));
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, -1, 5, true);
+
+ break;
+
+ case 22:
+ terminateMachine(_710Rpld4Mach);
+ _ripContractionMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 1541, false, triggerMachineByHashCallback, "rip contraption machine");
+ sendWSMessage_10000(1, _ripContractionMach02, _laderComesDownSeries, 1, 18, 31, _laderComesDownSeries, 18, 18, 0);
+
+ break;
+
+ case 31:
+ sendWSMessage_10000(1, _ripContractionMach02, _laderComesDownSeries, 19, 47, 3, _laderComesDownSeries, 47, 47, 0);
+ digi_play("710_s01", 1, 255, -1, -1);
+
+ break;
+
+ default:
+ break;
+ }
+ }
+ } // esi && player_said("Rope")
+
// TODO Not implemented yet
+
+ _G(player).command_ready = false;
}
void Room710::daemon() {
diff --git a/engines/m4/riddle/rooms/section7/room710.h b/engines/m4/riddle/rooms/section7/room710.h
index 95cf5417719..28f3105c6d6 100644
--- a/engines/m4/riddle/rooms/section7/room710.h
+++ b/engines/m4/riddle/rooms/section7/room710.h
@@ -54,14 +54,17 @@ private:
int32 _ripPullsRopeForLaderSeries = 0;
int32 _ripTrekMedReachHandPos1Series = 0;
- machine *_ripContraptionMach = nullptr;
- machine *_ripReacherMach = nullptr;
machine *_710Rpld4Mach = nullptr;
machine *_710Rpld5Mach = nullptr;
machine *_710Rprs1Mach = nullptr;
machine *_710Rprs2Mach = nullptr;
machine *_710Rprs3Mach = nullptr;
machine *_710Rprs4Mach = nullptr;
+ machine *_ripContraptionMach = nullptr;
+ machine *_ripContractionMach02 = nullptr;
+ machine *_ripPullsKeyropeMach = nullptr;
+ machine *_ripReacherMach = nullptr;
+ machine *_safariShadow1Mach = nullptr;
};
} // namespace Rooms
More information about the Scummvm-git-logs
mailing list