[Scummvm-git-logs] scummvm master -> 9f10a71a866e0aaf9ea97c8696a6f42fdf9dd48d
Strangerke
noreply at scummvm.org
Sun Nov 24 21:53:52 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:
9f10a71a86 M4: RIDDLE: room 702 - Implement parser
Commit: 9f10a71a866e0aaf9ea97c8696a6f42fdf9dd48d
https://github.com/scummvm/scummvm/commit/9f10a71a866e0aaf9ea97c8696a6f42fdf9dd48d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-11-24T22:53:35+01:00
Commit Message:
M4: RIDDLE: room 702 - Implement parser
Changed paths:
engines/m4/riddle/rooms/section7/room702.cpp
engines/m4/riddle/rooms/section7/room702.h
diff --git a/engines/m4/riddle/rooms/section7/room702.cpp b/engines/m4/riddle/rooms/section7/room702.cpp
index 0f406411bda..814c6db2b8e 100644
--- a/engines/m4/riddle/rooms/section7/room702.cpp
+++ b/engines/m4/riddle/rooms/section7/room702.cpp
@@ -115,7 +115,283 @@ void Room702::pre_parser() {
}
void Room702::parser() {
- //TODO
+ bool ecx = player_said_any("look", "look at");
+ bool talkFl = player_said_any("talk", "talk to");
+ bool esi = player_said("take");
+ bool edi = player_said_any("push", "pull", "gear", "open", "close");
+
+ if (player_said("CIGAR BAND", "GUARD") && inv_player_has("CIGAR BAND") && !_G(flags[V211])) {
+ _G(flags[V211]) = 1;
+ _G(flags[V228]) = 1;
+ _G(kernel).trigger_mode = KT_DAEMON;
+ kernel_timing_trigger(10, 40, nullptr);
+ _G(kernel).trigger_mode = KT_PARSE;
+ } else if (player_said("conv702a")) {
+ if (_G(kernel).trigger != 1) {
+ conv702a();
+ _G(flags[V211]) = 1;
+ _G(flags[V228]) = 1;
+ } else {
+ int32 who = conv_whos_talking();
+ if (who <= 0) {
+ _field54 = 2101;
+ } else if (who == 1) {
+ _field48 = 1103;
+ }
+ conv_resume(conv_get_handle());
+ }
+ } else if (talkFl && player_said("GUARD")) {
+ player_set_commands_allowed(false);
+ if (_field40 == 0) {
+ _field58 = -1;
+ _field44 = 1000;
+ _field48 = 1100;
+ _G(kernel).trigger_mode = KT_DAEMON;
+ kernel_trigger_dispatchx(kernel_trigger_create(100));
+ _G(kernel).trigger_mode = KT_PARSE;
+ } else {
+ _field40 = 0;
+ sendWSMessage_10000(1, _guardMach, _guardStepsAsideTalksSeries, 27, 1, 100, _guardStepsAsideTalksSeries, 1, 1, 0);
+ sendWSMessage_10000(1, _guardShadowMach, _702GuardShadow2Series, 1, 1, -1, _702GuardShadow2Series, 1, 1, 0);
+ _G(flags[V212]) = 0;
+ _field58 = -1;
+ _field44 = 1000;
+ _field48 = 1100;
+ }
+ } else if (ecx && player_said("TEMPLE"))
+ digi_play("702R02", 1, 255, -1, -1);
+ else if (ecx && player_said("WALL"))
+ digi_play("702R03", 1, 255, -1, -1);
+ else if (ecx && player_said("CEREMONIAL TORANA"))
+ digi_play("702R04", 1, 255, -1, -1);
+ else if (ecx && player_said("Ring")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ _ringCloseupMach = series_place_sprite("Ring closeup", 0, 0, -53, 100, 0);
+ digi_play("702_S01", 1, 255, 2, -1);
+
+ break;
+
+ case 2:
+ terminateMachine(_ringCloseupMach);
+ break;
+
+ default:
+ break;
+ }
+ } else if (ecx && player_said("GUARD")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ if (!_G(flags[V214]) && !_G(flags[V228])) {
+ digi_play("702R05", 1, 255, 2, -1);
+ } else {
+ digi_play("702R05", 1, 255, 3, -1);
+ }
+
+ break;
+
+ case 2:
+ digi_play("702R05A", 1, 255, 3, -1);
+ break;
+
+ case 3:
+ player_set_commands_allowed(true);
+ break;
+
+ default:
+ break;
+ }
+ } // ecx && player_said("GUARD")
+ else if (esi && _G(player).click_y <= 374) {
+ switch (imath_ranged_rand(1, 6)) {
+ case 1:
+ digi_play("com006", 1, 255, -1, -1);
+ break;
+ case 2:
+ digi_play("com007", 1, 255, -1, -1);
+ break;
+ case 3:
+ digi_play("com008", 1, 255, -1, -1);
+ break;
+ case 4:
+ digi_play("com009", 1, 255, -1, -1);
+ break;
+ case 5:
+ digi_play("com010", 1, 255, -1, -1);
+ break;
+ case 6:
+ digi_play("com011", 1, 255, -1, -1);
+ break;
+
+ default:
+ break;
+ }
+ } // esi && _G(player).click_y <= 374
+ else if (player_said(" ") && _G(flags[V224])) {
+ player_set_commands_allowed(false);
+ switch (_G(kernel).trigger) {
+ case -1:
+ ws_walk(_G(my_walker), 500, 287, nullptr, 2, 11, false);
+ break;
+
+ case 2:
+ ws_walk(_G(my_walker), 396, 184, nullptr, -1, 11, true);
+ kernel_timing_trigger(180, 3, nullptr);
+
+ break;
+
+ case 3:
+ disable_player_commands_and_fade_init(4);
+ break;
+
+ case 4:
+ 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(" ") && _G(flags[V224])
+ if (player_said("exit")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ disable_player_commands_and_fade_init(4);
+ break;
+
+ case 4:
+ if (_G(flags[V211]) && !_G(flags[V210]))
+ _G(flags[V213]) = 1;
+
+ _G(game).new_room = 701;
+ break;
+
+ default:
+ break;
+ }
+ } // player_said("exit")
+ else if (player_said_any(" ", " ") || (player_said("CIGAR BAND", "GUARD") && _G(flags[V211]))) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ if (_G(flags[V224]))
+ kernel_timing_trigger(10, 84, nullptr);
+ else if (!_G(flags[V211]))
+ kernel_timing_trigger(10, 5, nullptr);
+ else if (_G(flags[V210]))
+ kernel_timing_trigger(10, _G(flags[V212]) ? 84 : 83, nullptr);
+ else {
+ setGlobals1(_ripShowsRingSeries, 1, 10, 10, 10, 0, 10, 19, 19, 19, 0, 19, 30, 30, 30, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 80);
+ }
+
+ break;
+
+ case 2:
+ ws_walk(_G(my_walker), 396, 184, nullptr, -1, 11, true);
+ kernel_timing_trigger(180, 3, nullptr);
+
+ break;
+
+ case 3:
+ disable_player_commands_and_fade_init(4);
+ break;
+
+ case 4:
+ adv_kill_digi_between_rooms(false);
+ digi_play_loop("950_s39", 3, 255, -1, -1);
+ if (_G(flags[V211]) && !_G(flags[V210])) {
+ _G(flags[V213]) = 1;
+ }
+
+ _G(game).new_room = 703;
+
+ break;
+
+ case 5:
+ digi_play("702G20", 1, 255, 6, -1);
+ sendWSMessage_10000(1, _guardMach, _guardTalksAndBowsSeries, 8, 11, -1, _guardTalksAndBowsSeries, 8, 11, 1);
+ sendWSMessage_10000(1, _guardShadowMach, _702GuardShadow1Series, 8, 11, -1, _702GuardShadow1Series, 8, 11, 1);
+
+ break;
+
+ case 6:
+ sendWSMessage_10000(1, _guardMach, _guardTalksAndBowsSeries, 8, 8, -1, _guardTalksAndBowsSeries, 8, 8, 0);
+ sendWSMessage_10000(1, _guardShadowMach, _702GuardShadow1Series, 8, 8, -1, _702GuardShadow1Series, 8, 8, 0);
+ kernel_timing_trigger(10, 8, nullptr);
+
+ break;
+
+ case 7:
+ sendWSMessage_150000(_G(my_walker), 8);
+ break;
+
+ case 8:
+ player_set_commands_allowed(true);
+ break;
+
+ case 80:
+ sendWSMessage_120000(_G(my_walker), 81);
+ break;
+
+ case 81:
+ sendWSMessage_130000(_G(my_walker), 82);
+ break;
+
+ case 82:
+ sendWSMessage_150000(_G(my_walker), 83);
+ break;
+
+ case 83:
+ sendWSMessage_10000(1, _guardMach, _guardStepsAsideTalksSeries, 1, 27, 84, _guardStepsAsideTalksSeries, 27, 27, 0);
+ sendWSMessage_10000(1, _guardShadowMach, _702GuardShadow2Series, 1, 27, -1, _702GuardShadow2Series, 27, 27, 0);
+
+ break;
+
+ case 84:
+ ws_walk(_G(my_walker), 500, 287, nullptr, 2, 11, false);
+ break;
+
+ default:
+ break;
+ }
+ } // player_said_any(" ", " ") || (player_said("CIGAR BAND", "GUARD") && _G(flags[V211]))
+ else if (ecx && player_said(" ")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ digi_play("702R01", 1, 255, 2, -1);
+ break;
+
+ case 2:
+ if (_G(flags[V227])) {
+ kernel_timing_trigger(10, 3, nullptr);
+ } else {
+ _G(flags[V227]) = 1;
+ digi_play("702R01A", 1, 255, 3, -1);
+ }
+ break;
+
+ case 3:
+ player_set_commands_allowed(true);
+ break;
+
+ default:
+ break;
+ }
+ } // ecx && player_said(" ")
+ else if (player_said("GUARD", "CIGAR") || player_said("GUARD", "CIGAR WITHOUT BAND"))
+ digi_play("com083", 1, 255, -1, -1);
+ else if (!esi && !edi && player_said("GUARD"))
+ digi_play("702R21", 1, 255, -1, -1);
+ else
+ return;
+
+ _G(player).command_ready = false;
}
void Room702::daemon() {
@@ -379,7 +655,7 @@ void Room702::daemon() {
break;
case 2109:
- terminateMachine(_field10_mach);
+ terminateMachine(_ringCloseupMach);
_field54 = 2103;
kernel_timing_trigger(1, 111, nullptr);
@@ -400,6 +676,10 @@ void Room702::callback(frac16 myMessage, machine *sender) {
kernel_trigger_dispatchx(myMessage);
}
+void Room702::conv702a() {
+ //TODO
+}
+
} // namespace Rooms
} // namespace Riddle
} // namespace M4
diff --git a/engines/m4/riddle/rooms/section7/room702.h b/engines/m4/riddle/rooms/section7/room702.h
index 14a986fedea..6fccd920358 100644
--- a/engines/m4/riddle/rooms/section7/room702.h
+++ b/engines/m4/riddle/rooms/section7/room702.h
@@ -41,6 +41,7 @@ public:
private:
static void callback(frac16 myMessage, machine *sender);
+ void conv702a();
int32 _field3C = 0;
int32 _field40 = 0;
@@ -60,7 +61,7 @@ private:
int32 _ripShowsRingSeries = 0;
int32 _safariShadow1Series = 0;
- machine *_field10_mach = nullptr;
+ machine *_ringCloseupMach = nullptr;
machine *_guardMach = nullptr;
machine *_guardShadowMach = nullptr;
machine *_ripTalksGuardMach = nullptr;
More information about the Scummvm-git-logs
mailing list