[Scummvm-git-logs] scummvm master -> 6c417304ff95baecf45684e961c3849a250a0375
dreammaster
noreply at scummvm.org
Tue Oct 1 05:10: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:
6c417304ff M4: RIDDLE: In progress room 615
Commit: 6c417304ff95baecf45684e961c3849a250a0375
https://github.com/scummvm/scummvm/commit/6c417304ff95baecf45684e961c3849a250a0375
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-09-30T22:10:44-07:00
Commit Message:
M4: RIDDLE: In progress room 615
Changed paths:
engines/m4/riddle/rooms/section6/room615.cpp
engines/m4/riddle/rooms/section6/room615.h
engines/m4/riddle/walker.cpp
engines/m4/riddle/walker.h
diff --git a/engines/m4/riddle/rooms/section6/room615.cpp b/engines/m4/riddle/rooms/section6/room615.cpp
index 611b8cf79c5..a8cc4c54b8d 100644
--- a/engines/m4/riddle/rooms/section6/room615.cpp
+++ b/engines/m4/riddle/rooms/section6/room615.cpp
@@ -27,10 +27,463 @@ namespace M4 {
namespace Riddle {
namespace Rooms {
+void Room615::preload() {
+ Room::preload();
+ _G(flags)[V000] = 1;
+}
+
void Room615::init() {
+ player_set_commands_allowed(false);
+ _val1 = 0;
+ _val2 = 0;
+ _val3 = 90;
+
+ static const char *DIGI[] = {
+ "615r01", "615t01", "615r02", "615r02a",
+ "615t02", "615t03", "615r03", "615t04",
+ "615r04", "615t05", "615r05", "615t06",
+ "615r06", "615r08", "615r12", "615r13",
+ "615t10", "615t10a", "615r15", nullptr
+ };
+ for (static const char **name = DIGI; *name; ++name)
+ digi_preload(*name);
+
+ _ripTalking = series_load("615 RIP TALKING");
+ _ripTalk = series_load("RIP TREK TALK");
+ _loop0 = series_load("615LOOP0");
+ _loop1 = series_load("615LOOP1");
+ _loop2 = series_load("615LOOP2");
+ _loop3 = series_load("615LOOP3");
+ _loop4 = series_load("615LOOP4");
+ _loop5 = series_load("615LOOP5");
+ _loop6 = series_load("615LOOP6");
+ _loop7 = series_load("615LOOP7");
+ _ear2 = series_load("615ear2");
+
+ _untie = series_stream("615 UNTIE", 7, 0xf00, 46);
+ series_stream_break_on_frame(_untie, 25, 10);
+ kernel_timing_trigger(1, 9);
+
+ digi_preload("950_s28a");
+ sendWSMessage_60000(_G(my_walker));
+ _G(player).walker_in_this_scene = false;
+
+ series_unload(0);
+ series_unload(1);
+ series_unload(2);
+ series_unload(3);
+ series_unload(4);
+ series_unload(10);
+ series_unload(11);
+ series_unload(12);
+ series_unload(13);
+ series_unload(14);
+
+ digi_play_loop("950_s28a", 3, 50);
+ kernel_timing_trigger(1, 1);
}
void Room615::daemon() {
+ switch (_G(kernel).trigger) {
+ case 9:
+ digi_play("615r01", 1, 255, 10);
+ break;
+
+ case 10:
+ if (_flag1) {
+ _flag1 = false;
+ series_stream_break_on_frame(_untie, 79, 11);
+ digi_play("615t01", 1, 255, 11);
+ } else {
+ _flag1 = true;
+ }
+ break;
+
+ case 11:
+ if (_flag1) {
+ _flag1 = false;
+ series_stream_check_series(_untie, 30000);
+ digi_play("615r02", 1, 255, 15);
+ } else {
+ _flag1 = true;
+ }
+ break;
+
+ case 15:
+ _pu = series_stream("615PU01", 6, 0, 21);
+ series_stream_break_on_frame(_pu, 6, 17);
+ break;
+
+ case 17:
+ digi_play("615r02a", 1, 255, 21);
+ break;
+
+ case 21:
+ if (_flag1) {
+ _flag1 = false;
+ _pu = series_stream("515PU02", 6, 0x100, 24);
+ series_stream_break_on_frame(_pu, 5, 22);
+ series_stream_check_series(_pu, 4);
+ } else {
+ _flag1 = true;
+ }
+ break;
+
+ case 22:
+ digi_play("615t02", 1, 255, 24);
+ break;
+
+ case 24:
+ if (_flag1) {
+ _flag1 = false;
+ series_stream_check_series(_untie, 7);
+ ws_OverrideCrunchTime(_untie);
+ series_stream_break_on_frame(_untie, 144, 26);
+ digi_play("615t03", 1, 255, 25);
+ } else {
+ _flag1 = true;
+ }
+ break;
+
+ case 25:
+ _flag1 = false;
+ _ripTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 393, 361, 97, 256, 1,
+ triggerMachineByHashCallbackNegative, "rip talker");
+ sendWSMessage_10000(1, _ripTalker, _ripTalk, 1, 1, 40, _ripTalk, 1, 7, 4);
+ sendWSMessage_1a0000(_ripTalker, 11);
+ digi_play("615r03", 1, 255, 40);
+ break;
+
+ case 26:
+ if (!_val1)
+ series_stream_check_series(_untie, 3000);
+ break;
+
+ case 40:
+ if (_flag1) {
+ _flag1 = false;
+ digi_unload("615r01");
+ digi_unload("615t01");
+ digi_unload("615r02");
+ digi_unload("615r02a");
+ digi_unload("615t02");
+ digi_unload("615t03");
+ digi_unload("615r03");
+
+ _val1 = 1;
+ terminateMachineAndNull(_ripTalker);
+ series_stream_check_series(_untie, 7);
+ ws_OverrideCrunchTime(_untie);
+
+ } else {
+ _flag1 = true;
+ }
+ break;
+
+ case 46:
+ if (_ripTalker) {
+ kernel_timing_trigger(10, 46);
+ } else {
+ _ctr1 = 0;
+ series_load("RIP SAFARI WALKER POSITION 1");
+ series_load("RIP SAFARI WALKER POSITION 2", 1);
+ series_load("RIP SAFARI WALKER POSITION 3", 2);
+ series_load("SAFARI SHADOW 1", 10);
+ series_load("SAFARI SHADOW 1", 11);
+ series_load("SAFARI SHADOW 1", 12);
+
+ _pu = triggerMachineByHash_3000(8, 0, RIPLEY_SERIES_DIRS, RIPLEY_SHADOWS_DIRS,
+ 392, 361, 10, triggerMachineByHashCallback3000, "rip");
+ sendWSMessage_10000(_pu, 426, 347, 9, 50, 1);
+
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "untie tt");
+ sendWSMessage_10000(1, _tt, _loop7, 1, 1, 50, _loop7, 1, 5, 1);
+ sendWSMessage_1a0000(_tt, 15);
+ digi_play("615t04", 1, 255, 50);
+ }
+ break;
+
+ case 50:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ player_update_info(_pu, &_G(player_info));
+ ws_hide_walker(_pu);
+
+ series_play("SAFARI SHADOW 3", 0xf00, 128, -1, 600, -1,
+ _G(player_info).scale, _G(player_info).x, _G(player_info).y, 0, 0);
+ terminateMachineAndNull(_tt);
+
+ _untie = series_stream("615ALL1", 6, 0x100, 57);
+ series_stream_break_on_frame(_untie, 47, 55);
+ digi_play("615r04", 1);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 55:
+ digi_play("615t05", 1, 255, 60);
+ break;
+
+ case 57:
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "x");
+ sendWSMessage_10000(1, _tt, _loop0, 1, 1, 60, _loop0, 1, 5, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ break;
+
+ case 60:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ terminateMachineAndNull(_tt);
+ _untie = series_stream("615ALL1a", 6, 0x100, 65);
+ digi_play("615r05", 1, 255, 62);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 62:
+ digi_play("615t06", 1, 255, 75);
+ break;
+
+ case 65:
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "spleen");
+ sendWSMessage_10000(1, _tt, _loop1, 1, 1, 75, _loop1, 1, 7, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ break;
+
+ case 75:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ terminateMachineAndNull(_tt);
+ _untie = series_stream("615ALL2", 6, 0x100, 80);
+ digi_play("615r06", 1, 255, 80);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 80:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "spleen");
+ sendWSMessage_10000(1, _tt, _loop2, 1, 1, 85, _loop2, 1, 9, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ digi_play("615t07", 1, 255, 85);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 85:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _tt, _loop3, 1, 17, 87, _loop3, 18, 18, 1);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 87:
+ sendWSMessage_10000(1, _tt, _loop3, 19, 19, 90, _loop3, 19, 23, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ digi_play("615r07", 1, 255, 90);
+ break;
+
+ case 90:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _tt, _loop4, 1, 13, 93, _loop4, 14, 14, 1);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 93:
+ sendWSMessage_10000(1, _tt, _loop4, 15, 15, 96, _loop4, 15, 20, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ digi_play("615t08", 1, 255, 96);
+ break;
+
+ case 96:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _tt, _loop4, 21, 50, 98, _loop4, 50, 50, 1);
+ sendWSMessage_190000(_tt, 7);
+ digi_play("615t08a", 1, 255, 98);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 98:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ terminateMachineAndNull(_tt);
+ _untie = series_stream("615all3", 6, 0x100, 102);
+ digi_play("615r08", 1, 255, 102);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 102:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ _untie = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "spleen");
+ sendWSMessage_10000(1, _untie, _loop5, 1, 1, 105, _loop5, 1, 5, 1);
+ sendWSMessage_1a0000(_untie, 15);
+
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "spleen");
+ sendWSMessage_10000(1, _tt, _loop6, 1, 1, 105, _loop6, 1, 1, 1);
+ digi_play("615r09", 1, 255, 105);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 105:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _untie, _loop5, 1, 1, 108, _loop5, 1, 1, 1);
+ sendWSMessage_10000(1, _tt, _loop6, 1, 1, 108, _loop6, 1, 5, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ digi_play("615t09", 1, 255, 108);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 108:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _untie, _loop5, 1, 1, 112, _loop5, 1, 5, 1);
+ sendWSMessage_1a0000(_untie, 13);
+ sendWSMessage_10000(1, _tt, _loop6, 1, 1, 112, _loop6, 1, 1, 1);
+ digi_play("615r10", 1, 255, 112);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 112:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ inv_move_object("RONGORONGO TABLET", 615);
+ terminateMachineAndNull(_untie);
+ terminateMachineAndNull(_tt);
+ _G(flags)[V089] = 1;
+ _untie = series_stream("615ALL4", 6, 0x100, 115);
+
+ digi_play(_G(flags)[V288] ? "615r11" : "615r12", 1, 255, 115);
+ _G(flags)[V288] = 1;
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 115:
+ if (_ctr1 >= 1) {
+ _ctr1 = 0;
+ _untie = series_stream("615ALL5", 6, 0x100, 120);
+ series_stream_break_on_frame(_untie, 30, 116);
+ digi_play("615r13", 1, 255, 118);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 116:
+ series_stream_break_on_frame(_untie, 58, 150);
+ series_stream_check_series(_untie, 30000);
+ break;
+
+ case 118:
+ series_stream_check_series(_untie, 6);
+ ws_OverrideCrunchTime(_untie);
+ digi_play("615t10", 1, 255, 119);
+ break;
+
+ case 119:
+ _val2 = 1;
+
+ if (_val2) {
+ series_stream_check_series(_untie, 6);
+ ws_OverrideCrunchTime(_untie);
+ } else {
+ kernel_timing_trigger(10, 151);
+ }
+ break;
+
+ case 120:
+ midi_play("love", 255, 0, -1, 949);
+ _untie = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "spleen");
+ sendWSMessage_10000(1, _untie, _loop5, 1, 1, 125, _loop5, 1, 1, 1);
+ sendWSMessage_190000(_untie, 15);
+ sendWSMessage_1a0000(_untie, 15);
+
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallbackNegative, "spleen");
+ sendWSMessage_10000(1, _tt, _loop7, 1, 1, 125, _loop7, 1, 5, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ digi_play("615t10a", 1, 255, 125);
+ break;
+
+ case 125:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _untie, _loop5, 1, 1, 127, _loop5, 1, 5, 1);
+ sendWSMessage_1a0000(_untie, 13);
+ sendWSMessage_10000(1, _tt, _loop7, 1, 1, 127, _loop7, 1, 1, 1);
+ digi_play("615r14", 1, 255, 127);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 127:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _untie, _loop5, 1, 1, 130, _loop5, 1, 1, 1);
+ sendWSMessage_10000(1, _tt, _loop7, 1, 1, 130, _loop7, 1, 5, 1);
+ sendWSMessage_1a0000(_tt, 13);
+ digi_play("615t11", 1, 255, 130);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ case 130:
+ if (_ctr1 >= 2) {
+ _ctr1 = 0;
+ sendWSMessage_10000(1, _tt, _loop7, 1, 1, 133, _loop7, 1, 1, 1);
+ series_stream_break_on_frame(_untie, 5, 133);
+ } else {
+ ++_ctr1;
+ }
+ break;
+
+ // TODO
+ case 151:
+ if (_val2) {
+ series_stream_check_series(_untie, 6);
+ ws_OverrideCrunchTime(_untie);
+ } else {
+ kernel_timing_trigger(10, 151);
+ }
+ break;
+
+ // TODO
+ default:
+ break;
+ }
}
} // namespace Rooms
diff --git a/engines/m4/riddle/rooms/section6/room615.h b/engines/m4/riddle/rooms/section6/room615.h
index a1b92d9fbd4..ac1c56fe651 100644
--- a/engines/m4/riddle/rooms/section6/room615.h
+++ b/engines/m4/riddle/rooms/section6/room615.h
@@ -29,10 +29,34 @@ namespace Riddle {
namespace Rooms {
class Room615 : public Room {
+private:
+ int _ripTalking = 0;
+ int _ripTalk = 0;
+ int _loop0 = 0;
+ int _loop1 = 0;
+ int _loop2 = 0;
+ int _loop3 = 0;
+ int _loop4 = 0;
+ int _loop5 = 0;
+ int _loop6 = 0;
+ int _loop7 = 0;
+ int _ear2 = 0;
+ machine *_untie = nullptr;
+ machine *_pu = nullptr;
+ machine *_tt = nullptr;
+ machine *_ripTalker = nullptr;
+ int _val1 = 0;
+ int _val2 = 0;
+ int _val3 = 90;
+
+ bool _flag1 = false;
+ int _ctr1 = 0;
+
public:
Room615() : Room() {}
~Room615() override {}
+ void preload() override;
void init() override;
void daemon() override;
};
diff --git a/engines/m4/riddle/walker.cpp b/engines/m4/riddle/walker.cpp
index 0a94cee142c..9d357c47230 100644
--- a/engines/m4/riddle/walker.cpp
+++ b/engines/m4/riddle/walker.cpp
@@ -35,19 +35,20 @@ namespace Riddle {
#define SHADOW_SERIES_HASH 8
#define NUM_SHADOW_SERIES 5
+const int16 RIPLEY_SERIES_DIRS[] = {
+ 0, 1, 2, 3, 4, -4
+};
+const int16 RIPLEY_SHADOWS_DIRS[6] = {
+ 10, 11, 12, 13, 14, -1
+};
+
static const char *RIPLEY_SERIES[5] = {
"test1", "test2", "test3", "test4", "test5"
};
-static const int16 RIPLEY_SERIES_DIRS[] = {
- 0, 1, 2, 3, 4, -4
-};
static const char *RIPLEY_SHADOWS[5] = {
"ripsh1", "ripsh2", "ripsh3", "ripsh4", "ripsh5"
};
-static const int16 RIPLEY_SHADOWS_DIRS[6] = {
- 10, 11, 12, 13, 14, -1
-};
static const char *SAFARI_SERIES[4] = {
"rip safari walker position 1",
diff --git a/engines/m4/riddle/walker.h b/engines/m4/riddle/walker.h
index 89ff4ce6b61..b8761d45f55 100644
--- a/engines/m4/riddle/walker.h
+++ b/engines/m4/riddle/walker.h
@@ -29,6 +29,9 @@
namespace M4 {
namespace Riddle {
+extern const int16 RIPLEY_SERIES_DIRS[];
+extern const int16 RIPLEY_SHADOWS_DIRS[6];
+
// These are the walker types
enum {
WALKER_PLAYER = 0,
More information about the Scummvm-git-logs
mailing list