[Scummvm-git-logs] scummvm master -> c7772467144976c6eb27cbdf6e8f51770aed3163
Strangerke
noreply at scummvm.org
Sat Dec 28 07:30:40 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
440e2fdd3e M4: RIDDLE: Room 711: Implement parser
c777246714 M4: RIDDLE: Room 711: Last polishing
Commit: 440e2fdd3ed18a94d769122a1df071a1e17e27c3
https://github.com/scummvm/scummvm/commit/440e2fdd3ed18a94d769122a1df071a1e17e27c3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-28T08:24:56+01:00
Commit Message:
M4: RIDDLE: Room 711: Implement parser
Changed paths:
engines/m4/riddle/rooms/section7/room711.cpp
engines/m4/riddle/rooms/section7/room711.h
diff --git a/engines/m4/riddle/rooms/section7/room711.cpp b/engines/m4/riddle/rooms/section7/room711.cpp
index 7df946da68c..687587e8680 100644
--- a/engines/m4/riddle/rooms/section7/room711.cpp
+++ b/engines/m4/riddle/rooms/section7/room711.cpp
@@ -54,7 +54,97 @@ void Room711::pre_parser() {
}
void Room711::parser() {
- // TODO No implementation yet
+ bool ecx = player_said_any("look", "look at");
+ bool esi = player_said_any("talk", "talk to", "take");
+ bool edi = player_said_any("push", "pull", "gear", "open", "close");
+
+ if (ecx && player_said("Window")) {
+ digi_play("711R04", 1, 255, -1, -1);
+ } else if (ecx && player_said("Ladder")) {
+ digi_play("711R05", 1, 255, -1, -1);
+ } else if (ecx && player_said("Sikkimese Book")) {
+ digi_play("711R02", 1, 255, -1, -1);
+ } else if (ecx && player_said("Gold Icon")) {
+ digi_play("711R18", 1, 255, -1, -1);
+ } else if ((ecx || player_said("JOURNAL")) && player_said("Master Lu's Book")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ if (_G(flags[V286]))
+ digi_play("203r54", 1, 255, -1, -1);
+ else {
+ player_set_commands_allowed(false);
+ digi_play("711R03", 1, 255, 2, -1);
+ digi_preload("950_s34", -1);
+ }
+
+ break;
+
+ case 2:
+ _ripSketchingSeries = series_load("RIP SKETCHING IN NOTEBOOK POS 2", -1, nullptr);
+ setGlobals1(_ripSketchingSeries, 1, 17, 17, 17, 0, 18, 39, 39, 39, 39, 38, 1, 1, 1, 1, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 4);
+
+ break;
+
+ case 4:
+ sendWSMessage_120000(_G(my_walker), 5);
+ digi_play("950_S34", 2, 200, 5, 950);
+
+ break;
+
+ case 5:
+ sendWSMessage_130000(_G(my_walker), 6);
+ break;
+
+ case 6:
+ sendWSMessage_150000(_G(my_walker), 8);
+ digi_unload("950_s34");
+
+ break;
+
+ case 8:
+ _G(flags[V286]) = 1;
+ player_set_commands_allowed(true);
+
+ break;
+
+ default:
+ break;
+
+ }
+ } // (ecx || player_said("JOURNAL")) && player_said("Master Lu's Book")
+
+ else if (ecx && player_said(" ")) {
+ digi_play("711R01", 1, 255, -1, -1);
+ } else if (esi && player_said("Sikkimese Book")) {
+ digi_play("711R07", 1, 255, -1, -1);
+ } else if (esi && player_said("Master Lu's Book")) {
+ digi_play("711R06", 1, 255, -1, -1);
+ } else if (esi && player_said("Ladder")) {
+ digi_play("711R08", 1, 255, -1, -1);
+ } else if (esi && player_said("Gold Icon")) {
+ digi_play("711R19", 1, 255, -1, -1);
+ } else if (edi && player_said("Ladder")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ disable_player_commands_and_fade_init(2);
+
+ break;
+
+ case 2:
+ player_set_commands_allowed(true);
+ _G(game).new_room = _G(flags[V286]) ? 706 : 710;
+
+ break;
+
+ default:
+ break;
+ }
+ } else
+ return;
+
+ _G(player).command_ready = false;
}
void Room711::daemon() {
diff --git a/engines/m4/riddle/rooms/section7/room711.h b/engines/m4/riddle/rooms/section7/room711.h
index 547f9847580..d20d1b20e6e 100644
--- a/engines/m4/riddle/rooms/section7/room711.h
+++ b/engines/m4/riddle/rooms/section7/room711.h
@@ -41,6 +41,7 @@ public:
private:
int32 _711Rp01Series = 0;
+ int32 _ripSketchingSeries = 0;
};
} // namespace Rooms
Commit: c7772467144976c6eb27cbdf6e8f51770aed3163
https://github.com/scummvm/scummvm/commit/c7772467144976c6eb27cbdf6e8f51770aed3163
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-28T08:30:32+01:00
Commit Message:
M4: RIDDLE: Room 711: Last polishing
Changed paths:
engines/m4/riddle/rooms/section7/room711.cpp
diff --git a/engines/m4/riddle/rooms/section7/room711.cpp b/engines/m4/riddle/rooms/section7/room711.cpp
index 687587e8680..e40aa5c1d25 100644
--- a/engines/m4/riddle/rooms/section7/room711.cpp
+++ b/engines/m4/riddle/rooms/section7/room711.cpp
@@ -54,19 +54,19 @@ void Room711::pre_parser() {
}
void Room711::parser() {
- bool ecx = player_said_any("look", "look at");
- bool esi = player_said_any("talk", "talk to", "take");
- bool edi = player_said_any("push", "pull", "gear", "open", "close");
+ const bool lookFl = player_said_any("look", "look at");
+ const bool talkFl = player_said_any("talk", "talk to", "take");
+ const bool gearFl = player_said_any("push", "pull", "gear", "open", "close");
- if (ecx && player_said("Window")) {
+ if (lookFl && player_said("Window")) {
digi_play("711R04", 1, 255, -1, -1);
- } else if (ecx && player_said("Ladder")) {
+ } else if (lookFl && player_said("Ladder")) {
digi_play("711R05", 1, 255, -1, -1);
- } else if (ecx && player_said("Sikkimese Book")) {
+ } else if (lookFl && player_said("Sikkimese Book")) {
digi_play("711R02", 1, 255, -1, -1);
- } else if (ecx && player_said("Gold Icon")) {
+ } else if (lookFl && player_said("Gold Icon")) {
digi_play("711R18", 1, 255, -1, -1);
- } else if ((ecx || player_said("JOURNAL")) && player_said("Master Lu's Book")) {
+ } else if ((lookFl || player_said("JOURNAL")) && player_said("Master Lu's Book")) {
switch (_G(kernel).trigger) {
case -1:
if (_G(flags[V286]))
@@ -114,17 +114,17 @@ void Room711::parser() {
}
} // (ecx || player_said("JOURNAL")) && player_said("Master Lu's Book")
- else if (ecx && player_said(" ")) {
+ else if (lookFl && player_said(" ")) {
digi_play("711R01", 1, 255, -1, -1);
- } else if (esi && player_said("Sikkimese Book")) {
+ } else if (talkFl && player_said("Sikkimese Book")) {
digi_play("711R07", 1, 255, -1, -1);
- } else if (esi && player_said("Master Lu's Book")) {
+ } else if (talkFl && player_said("Master Lu's Book")) {
digi_play("711R06", 1, 255, -1, -1);
- } else if (esi && player_said("Ladder")) {
+ } else if (talkFl && player_said("Ladder")) {
digi_play("711R08", 1, 255, -1, -1);
- } else if (esi && player_said("Gold Icon")) {
+ } else if (talkFl && player_said("Gold Icon")) {
digi_play("711R19", 1, 255, -1, -1);
- } else if (edi && player_said("Ladder")) {
+ } else if (gearFl && player_said("Ladder")) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
More information about the Scummvm-git-logs
mailing list