[Scummvm-git-logs] scummvm master -> 7b4d9e2ff2777ea9c9ff9baad08f9f4aeca313f2
Strangerke
noreply at scummvm.org
Tue Dec 3 06:42:46 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:
7b4d9e2ff2 M4: RIDDLE: room 704: Finish the implementation of room 704 (useWheelOnNiche)
Commit: 7b4d9e2ff2777ea9c9ff9baad08f9f4aeca313f2
https://github.com/scummvm/scummvm/commit/7b4d9e2ff2777ea9c9ff9baad08f9f4aeca313f2
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-03T07:42:36+01:00
Commit Message:
M4: RIDDLE: room 704: Finish the implementation of room 704 (useWheelOnNiche)
Changed paths:
engines/m4/riddle/rooms/section7/room704.cpp
engines/m4/riddle/rooms/section7/room704.h
diff --git a/engines/m4/riddle/rooms/section7/room704.cpp b/engines/m4/riddle/rooms/section7/room704.cpp
index f7318765088..41e12e48469 100644
--- a/engines/m4/riddle/rooms/section7/room704.cpp
+++ b/engines/m4/riddle/rooms/section7/room704.cpp
@@ -499,31 +499,31 @@ void Room704::parser() {
else if (player_said("TRUTH WHEEL", "EMPTY NICHE")) {
if (_G(kernel).trigger != -1 || inv_player_has("TRUTH WHEEL")) {
- subA1DDF(_G(kernel).trigger, 4);
+ useWheelOnNiche(_G(kernel).trigger, 4);
} else {
player_set_commands_allowed(true);
}
} else if (player_said("PEACE WHEEL", "EMPTY NICHE")) {
if (_G(kernel).trigger != -1 || inv_player_has("PEACE WHEEL")) {
- subA1DDF(_G(kernel).trigger, 1);
+ useWheelOnNiche(_G(kernel).trigger, 1);
} else {
player_set_commands_allowed(true);
}
} else if (player_said("WISDOM WHEEL", "EMPTY NICHE")) {
if (_G(kernel).trigger != -1 || inv_player_has("WISDOM WHEEL")) {
- subA1DDF(_G(kernel).trigger, 5);
+ useWheelOnNiche(_G(kernel).trigger, 5);
} else {
player_set_commands_allowed(true);
}
} else if (player_said("INSIGHT WHEEL", "EMPTY NICHE")) {
if (_G(kernel).trigger != -1 || inv_player_has("INSIGHT WHEEL")) {
- subA1DDF(_G(kernel).trigger, 2);
+ useWheelOnNiche(_G(kernel).trigger, 2);
} else {
player_set_commands_allowed(true);
}
} else if (player_said("SERENITY WHEEL", "EMPTY NICHE")) {
if (_G(kernel).trigger != -1 || inv_player_has("SERENITY WHEEL")) {
- subA1DDF(_G(kernel).trigger, 3);
+ useWheelOnNiche(_G(kernel).trigger, 3);
} else {
player_set_commands_allowed(true);
}
@@ -953,8 +953,182 @@ void Room704::playCheckBrochureAnim(int32 trigger, const char *digiName) {
}
}
-void Room704::subA1DDF(int32 trigger, int val1) {
- // TODO Not yet implemented
+void Room704::useWheelOnNiche(int32 trigger, int val1) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ if (_G(flags[V218])) {
+ digi_play("com080", 1, 255, 114, -1);
+ } else {
+ setGlobals1(_ripTrekMedReachHandPos1Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 101);
+ }
+
+ break;
+
+ case 101:
+ kernel_timing_trigger(5, 102, nullptr);
+ break;
+
+ case 102:
+ sendWSMessage_120000(_G(my_walker), 103);
+ break;
+
+ case 103:
+ kernel_timing_trigger(5, 104, nullptr);
+ break;
+
+ case 104:
+ switch (_G(flags[V218])) {
+ case 0:
+ break;
+ case 1:
+ inv_move_object("PEACE WHEEL", 704);
+ _G(flags[V218]) = 1;
+ digi_play("950_S40A", 2, 255, -1, 950);
+ _prayerWheelMach = series_place_sprite("704 PEACE PRAYER WHEEL", 0, 0, 0, 100, 1280);
+ kernel_timing_trigger(5, 105);
+
+ break;
+
+ case 2:
+ inv_move_object("INSIGHT WHEEL", 704);
+ _G(flags[V218]) = 2;
+ digi_play("950_S40A", 2, 255, -1, 950);
+ _prayerWheelMach = series_place_sprite("704 INSIGHT PRAYER WHEEL", 0, 0, 0, 100, 1280);
+ kernel_timing_trigger(5, 105);
+
+ break;
+
+ case 3:
+ inv_move_object("SERENITY WHEEL", 704);
+ _G(flags[V218]) = 3;
+ digi_play("950_S40A", 2, 255, -1, 950);
+ _prayerWheelMach = series_place_sprite("704 SERENITY PRAYER WHEEL", 0, 0, 0, 100, 1280);
+ kernel_timing_trigger(5, 105);
+
+ break;
+
+ case 4:
+ inv_move_object("TRUTH WHEEL", 704);
+ _G(flags[V218]) = 4;
+ digi_play("950_S40A", 2, 255, -1, 950);
+ _prayerWheelMach = series_place_sprite("704 TRUTH PRAYER WHEEL", 0, 0, 0, 100, 1280);
+ kernel_timing_trigger(5, 105);
+
+ break;
+
+ case 5:
+ inv_move_object("WISDOM WHEEL", 704);
+ _G(flags[V218]) = 5;
+ digi_play("950_S40A", 2, 255, -1, 950);
+ _prayerWheelMach = series_place_sprite("704 WISDOM PRAYER WHEEL", 0, 0, 0, 100, 1280);
+ kernel_timing_trigger(5, 105);
+
+ break;
+
+ default:
+ break;
+ }
+
+ break;
+
+ case 105:
+ switch (val1) {
+ case 1:
+ digi_play("705r06", 1, 255, -1, 705);
+ break;
+ case 2:
+ digi_play("705r15", 1, 255, -1, 705);
+ break;
+
+ case 3:
+ sendWSMessage_130000(_G(my_walker), 106);
+ return;
+
+ case 4:
+ digi_play("706r11", 1, 255, -1, 706);
+ break;
+
+ case 5:
+ digi_play("703r12", 1, 255, -1, 703);
+ break;
+
+ default:
+ break;
+ }
+ sendWSMessage_130000(_G(my_walker), 113);
+
+ break;
+
+ case 106:
+ digi_play("704r10", 1, 255, 107, -1);
+ break;
+
+ case 107:
+ _704Monk2Series = series_load("704 MONK 2", -1, nullptr);
+ _monkMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0, false, callback, "monk");
+ sendWSMessage_10000(1, _monkMach, _704Monk2Series, 1, 18, 908, _704Monk2Series, 18, 18, 0);
+
+ break;
+
+ case 108:
+ terminateMachine(_monkMach);
+ series_unload(_704Monk2Series);
+ sendWSMessage_150000(_G(my_walker), -1);
+ ws_walk(_G(my_walker), 6, 344, nullptr, 109, 11, true);
+
+ break;
+
+ case 109:
+ ws_walk(_G(my_walker), 4, 290, nullptr, -1, 11, true);
+ kernel_timing_trigger(60, 111, nullptr);
+
+ break;
+
+ case 111:
+ disable_player_commands_and_fade_init(112);
+ break;
+
+ case 112:
+ adv_kill_digi_between_rooms(false);
+ digi_play_loop("950_s39", 3, 255, -1, -1);
+ _G(game).new_room = 705;
+
+ break;
+
+ case 113:
+ if (_G(flags[V218]) == 3) {
+ terminateMachine(_monkMach);
+ series_unload(_704Monk2Series);
+ }
+
+ sendWSMessage_150000(_G(my_walker), 114);
+
+ break;
+
+ case 114:
+ hotspot_set_active(_G(currentSceneDef).hotspots, "EMPTY NICHE", false);
+ hotspot_set_active(_G(currentSceneDef).hotspots, "PRAYER WHEEL #6", true);
+ player_set_commands_allowed(true);
+
+ break;
+
+ case 908:
+ sendWSMessage_10000(1, _monkMach, _704Monk2Series, 19, 21, -1, _704Monk2Series, 22, 24, 4);
+ sendWSMessage_1a0000(_monkMach, 9);
+ digi_play("704f02", 1, 255, 912, -1);
+
+ break;
+
+ case 912:
+ sendWSMessage_10000(1, _monkMach, _704Monk2Series, 25, 28, 113, _704Monk2Series, 28, 28, 0);
+ break;
+
+ default:
+ break;
+
+ }
}
} // namespace Rooms
diff --git a/engines/m4/riddle/rooms/section7/room704.h b/engines/m4/riddle/rooms/section7/room704.h
index 74a7cb2d3aa..c28a1ef049f 100644
--- a/engines/m4/riddle/rooms/section7/room704.h
+++ b/engines/m4/riddle/rooms/section7/room704.h
@@ -43,7 +43,7 @@ private:
static void callback(frac16 myMessage, machine *sender);
void conv704a();
void playCheckBrochureAnim(int32 trigger, const char *digiName);
- void subA1DDF(int32 trigger, int val1);
+ void useWheelOnNiche(int32 trigger, int val1);
int32 _field58_mode = 0;
int32 _field5C_should = 0;
More information about the Scummvm-git-logs
mailing list