[Scummvm-git-logs] scummvm master -> 7e811ec63e8048a306873f721bac69b77c1f472e
Strangerke
noreply at scummvm.org
Sun Feb 9 22:37:35 UTC 2025
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:
b3d1d6fd53 M4: RIDDLE: Fix several issues in room810 (related to sendWSMessage_10000)
7e811ec63e M4: RIDDLE: Partial implementation of Room811::daemon (up to trigger 34)
Commit: b3d1d6fd53860550522fba318bba1a08474c4871
https://github.com/scummvm/scummvm/commit/b3d1d6fd53860550522fba318bba1a08474c4871
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-09T23:37:19+01:00
Commit Message:
M4: RIDDLE: Fix several issues in room810 (related to sendWSMessage_10000)
Changed paths:
engines/m4/riddle/rooms/section8/room810.cpp
engines/m4/riddle/triggers.h
diff --git a/engines/m4/riddle/rooms/section8/room810.cpp b/engines/m4/riddle/rooms/section8/room810.cpp
index bec959d2b1c..2b3c129f58e 100644
--- a/engines/m4/riddle/rooms/section8/room810.cpp
+++ b/engines/m4/riddle/rooms/section8/room810.cpp
@@ -139,13 +139,13 @@ void Room810::parser() {
case 10:
_ripLooksAroundAndNodsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 415, 312, 46, 512, false, triggerMachineByHashCallback, "rip takes seal");
ws_hide_walker(_G(my_walker));
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 1, _ripTrekHandTalkPos3Series, 6, -1, _ripTrekHandTalkPos3Series, 7, 10, 4);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripTrekHandTalkPos3Series,1, 6, -1, _ripTrekHandTalkPos3Series, 7, 10, 4);
_safariShadow3Mach = series_show("SAFARI SHADOW 3", 1280, 16, -1, -1, 0, 46, 415, 312);
break;
case 18:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 6, _ripTrekHandTalkPos3Series, 1, -1, _ripTrekHandTalkPos3Series, 1, 1, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripTrekHandTalkPos3Series, 6, 1, -1, _ripTrekHandTalkPos3Series, 1, 1, 0);
kernel_timing_trigger(15, 20, nullptr);
break;
@@ -157,13 +157,13 @@ void Room810::parser() {
break;
case 22:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 1, _ripTrekHandTalkPos3Series, 6, -1, _ripTrekHandTalkPos3Series, 7, 10, 4);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripTrekHandTalkPos3Series, 1, 6, -1, _ripTrekHandTalkPos3Series, 7, 10, 4);
kernel_timing_trigger(540, 25, nullptr);
break;
case 24:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 6, _ripTrekHandTalkPos3Series, 1, -1, _ripTrekHandTalkPos3Series, 1, 1, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripTrekHandTalkPos3Series, 6, 1, -1, _ripTrekHandTalkPos3Series, 1, 1, 0);
break;
case 40:
@@ -171,13 +171,13 @@ void Room810::parser() {
terminateMachine(_safariShadow3Mach);
terminateMachine(_810SealMach);
_ripLooksAroundAndNodsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip takes seal");
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 1, _ripleyTakesJadeSealFromTombSeries, 38, 48, _ripleyTakesJadeSealFromTombSeries, 38, 38, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 1, 38, 48, _ripleyTakesJadeSealFromTombSeries, 38, 38, 0);
break;
case 48:
_blockSlidesOutMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "block slides out");
- sendWSMessage_10000(1, _blockSlidesOutMach, 1, _810BlockSlidesOutSeries, 14, -1, _810BlockSlidesOutSeries, 14, 14, 0);
+ sendWSMessage_10000(1, _blockSlidesOutMach, _810BlockSlidesOutSeries, 1, 14, -1, _810BlockSlidesOutSeries, 14, 14, 0);
sendWSMessage_190000(_blockSlidesOutMach, 12);
digi_play("810_s01", 3, 255, 60, 810);
kernel_timing_trigger(40, 50, nullptr);
@@ -185,7 +185,7 @@ void Room810::parser() {
break;
case 50:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 39, _ripleyTakesJadeSealFromTombSeries, 45, 51, _ripleyTakesJadeSealFromTombSeries, 45, 45, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 39, 45, 51, _ripleyTakesJadeSealFromTombSeries, 45, 45, 0);
break;
case 51:
@@ -197,17 +197,17 @@ void Room810::parser() {
break;
case 53:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 46, _ripleyTakesJadeSealFromTombSeries, 52, 54, _ripleyTakesJadeSealFromTombSeries, 52, 52, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 46, 52, 54, _ripleyTakesJadeSealFromTombSeries, 52, 52, 0);
break;
case 54:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 52, _ripleyTakesJadeSealFromTombSeries, 46, 55, _ripleyTakesJadeSealFromTombSeries, 57, 57, 0);
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 46, _ripleyTakesJadeSealFromTombSeries, 52, 56, _ripleyTakesJadeSealFromTombSeries, 52, 52, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 52, 46, 55, _ripleyTakesJadeSealFromTombSeries, 57, 57, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 46, 52, 56, _ripleyTakesJadeSealFromTombSeries, 52, 52, 0);
break;
case 55:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 46, _ripleyTakesJadeSealFromTombSeries, 52, 56, _ripleyTakesJadeSealFromTombSeries, 52, 52, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 46, 52, 56, _ripleyTakesJadeSealFromTombSeries, 52, 52, 0);
break;
case 56:
@@ -215,7 +215,7 @@ void Room810::parser() {
break;
case 58:
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 52, _ripleyTakesJadeSealFromTombSeries, 84, 110, _ripleyTakesJadeSealFromTombSeries, 84, 84, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripleyTakesJadeSealFromTombSeries, 52, 84, 110, _ripleyTakesJadeSealFromTombSeries, 84, 84, 0);
kernel_timing_trigger(25, 70, nullptr);
break;
@@ -270,7 +270,7 @@ void Room810::daemon() {
switch (_G(kernel).trigger) {
case 1:
_ripLooksAroundAndNodsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 160, 318, 46, 768, false, triggerMachineByHashCallback, "rip looks around and nods");
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 1, _ripPos3LookAroundSeries, 16, 51, _ripPos3LookAroundSeries, 17, 20, 4);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripPos3LookAroundSeries, 1, 16, 51, _ripPos3LookAroundSeries, 17, 20, 4);
_safariShadow3Mach = series_show("SAFARI SHADOW 3", 1280, 16, -1, -1, 0, 46, 160, 318);
break;
@@ -283,7 +283,7 @@ void Room810::daemon() {
case 52:
sendWSMessage_190000(_ripLooksAroundAndNodsMach, 12);
- sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, 16, _ripPos3LookAroundSeries, 1, 53, _ripPos3LookAroundSeries, 1, 1, 0);
+ sendWSMessage_10000(1, _ripLooksAroundAndNodsMach, _ripPos3LookAroundSeries, 16, 1, 53, _ripPos3LookAroundSeries, 1, 1, 0);
break;
diff --git a/engines/m4/riddle/triggers.h b/engines/m4/riddle/triggers.h
index c2064c3c131..b19f0fe9c84 100644
--- a/engines/m4/riddle/triggers.h
+++ b/engines/m4/riddle/triggers.h
@@ -38,7 +38,7 @@ extern void setGlobals1(int series, int val2, int val3, int val4, int val5,
extern void setGlobals3(int series, int val1, int val2);
extern void setGlobals4(int series, int val2, int val3, int val4);
-extern void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
+extern void sendWSMessage_10000(int val1, machine *mach, int series1, int val3,
int val4, int trigger, int series2, int val6, int val7, int val8);
extern void sendWSMessage_10000(machine *mach, int destX, int destY, int facing,
int trigger, int complete_walk);
Commit: 7e811ec63e8048a306873f721bac69b77c1f472e
https://github.com/scummvm/scummvm/commit/7e811ec63e8048a306873f721bac69b77c1f472e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-09T23:37:20+01:00
Commit Message:
M4: RIDDLE: Partial implementation of Room811::daemon (up to trigger 34)
Changed paths:
engines/m4/riddle/rooms/section8/room811.cpp
engines/m4/riddle/rooms/section8/room811.h
diff --git a/engines/m4/riddle/rooms/section8/room811.cpp b/engines/m4/riddle/rooms/section8/room811.cpp
index 1d4e9536948..b57361c1745 100644
--- a/engines/m4/riddle/rooms/section8/room811.cpp
+++ b/engines/m4/riddle/rooms/section8/room811.cpp
@@ -63,11 +63,11 @@ void Room811::init() {
_811BA05Series = series_load("811BA05", -1, nullptr);
_811RipleyMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 1024, false, triggerMachineByHashCallback, "811 ripley");
- sendWSMessage_10000(1, _811RipleyMach, 1, _811RP01Series, 1, -1, _811RP01Series, 1, 1, 0);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
_811McMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 1280, false, triggerMachineByHashCallback, "811 mc");
- sendWSMessage_10000(1, _811McMach, 1, _811MC01Series, 1, -1, _811MC01Series, 1, 1, 0);
+ sendWSMessage_10000(1, _811McMach, _811MC01Series, 1, 1, -1, _811MC01Series, 1, 1, 0);
_811BaronMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "811 baron");
- sendWSMessage_10000(1, _811BaronMach, 12, _811BA01Series, 12, 1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, 1, _811BA01Series, 12, 17, 4);
sendWSMessage_110000(_811BaronMach, 11);
}
@@ -77,9 +77,250 @@ void Room811::pre_parser() {
}
void Room811::parser() {
+ // Nothing
}
void Room811::daemon() {
+ switch (_G(kernel).trigger) {
+ case 1:
+ digi_play("811B01", 2, 255, 2, -1);
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ digi_play("811m01", 2, 255, 3, -1);
+ sendWSMessage_10000(1, _811McMach, _811MC01Series, 1, 1, -1, _811MC01Series, 1, 6, 4);
+ sendWSMessage_1a0000(_811McMach, 11);
+
+ break;
+
+ case 3:
+ sendWSMessage_10000(1, _811McMach, _811MC01Series, 1, 1, -1, _811MC01Series, 1, 1, 0);
+ digi_play("811r01", 2, 255, 5, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 5:
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ digi_play("811b02", 2, 255, 7, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 7:
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ _811Pu01Mach = series_stream("811pu01", 10, 256, -1);
+ digi_play("950_s55", 1, 60, -1, 950);
+ series_stream_break_on_frame(_811Pu01Mach, 26, 1050);
+ digi_play("811r02", 2, 255, 11, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 11:
+ digi_unload("811R02");
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ digi_play("811b03", 2, 255, 13, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 13:
+ digi_unload("811B03");
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ _811Pu01Mach = series_stream("811pu02", 12, 256, -1);
+ series_stream_break_on_frame(_811Pu01Mach, 5, 76);
+ digi_play("811r03", 2, 255, 15, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 15:
+ digi_unload("811r03");
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ digi_play("811B04", 2, 255, 17, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 17:
+ digi_unload("811B04");
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ digi_play("811m02", 2, 255, 19, -1);
+ sendWSMessage_10000(1, _811McMach, _811MC01Series, 1, 1, -1, _811MC01Series, 1, 6, 4);
+ sendWSMessage_1a0000(_811McMach, 11);
+
+ break;
+
+ case 19:
+ sendWSMessage_10000(1, _811McMach, _811MC01Series, 1, 1, -1, _811MC01Series, 1, 1, 0);
+ digi_play("811r04", 2, 255, 20, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 20:
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ digi_play("811B05", 2, 255, 21, -1);
+ kernel_timing_trigger(45, 1100, nullptr);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 21:
+ digi_play("811B05A", 2, 255, 23, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA02Series, 1, 12, 22, _811BA02Series, 12, 12, 0);
+
+ break;
+
+ case 22:
+ sendWSMessage_10000(1, _811BaronMach, _811BA02Series, 12, 1, -1, _811BA01Series, 12, 17, 0);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 23:
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ _811Pu01Mach = series_stream("811pu03", 15, 256, -1);
+ series_stream_break_on_frame(_811Pu01Mach, 5, 77);
+ digi_play("811B06", 2, 255, 25, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 25:
+ digi_unload("811B06");
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ digi_play("811r05", 2, 255, 26, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 26:
+ digi_unload("811R05");
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ digi_play("811B07", 2, 255, 27, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 27:
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ digi_play("811r06", 2, 255, 28, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 28:
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ kernel_timing_trigger(20, 29, nullptr);
+
+ break;
+
+ case 29:
+ digi_play("811B08", 2, 255, 30, -1);
+ kernel_timing_trigger(95, 1110, nullptr);
+ sendWSMessage_10000(1, _811BaronMach, _811BA03Series, 1, 24, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 30:
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ digi_play("811R07", 2, 255, 31, -1);
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 7, 4);
+ sendWSMessage_1a0000(_811RipleyMach, 11);
+
+ break;
+
+ case 31:
+ sendWSMessage_10000(1, _811RipleyMach, _811RP01Series, 1, 1, -1, _811RP01Series, 1, 1, 0);
+ digi_play("811B09", 2, 255, 82, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 17, 4);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 32:
+ digi_play("811B09B", 2, 255, 34, -1);
+ sendWSMessage_10000(1, _811BaronMach, _811BA05Series, 1, 4, 33, _811BA05Series, 24, 24, 0);
+
+ break;
+
+ case 33:
+ sendWSMessage_10000(1, _811BaronMach, _811BA05Series, 24, 1, -1, _811BA01Series, 12, 17, 0);
+ sendWSMessage_1a0000(_811BaronMach, 11);
+
+ break;
+
+ case 34:
+ sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+ series_unload(_811BA02Series);
+ series_unload(_811BA03Series);
+ series_unload(_811BA04Series);
+ series_unload(_811BA05Series);
+
+ digi_stop(1);
+ digi_stop(2);
+
+ digi_unload("811_s01");
+ digi_unload("811_s01a");
+ digi_unload("811_s01b");
+ digi_unload("950_s55");
+ digi_unload("811R02");
+ digi_unload("811B03");
+ digi_unload("811R03");
+ digi_unload("811B04");
+ digi_unload("811B06");
+ digi_unload("811R05");
+
+ _811EndSeries = series_load("811END", -1, nullptr);
+
+ terminateMachine(_811RipleyMach);
+ terminateMachine(_811McMach);
+ terminateMachine(_811BaronMach);
+
+ series_unload(_811RP01Series);
+ series_unload(_811MC01Series);
+ series_unload(_811BA01Series);
+
+ _811Pu01Mach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 256, false, triggerMachineByHashCallback, "811 end series");
+ sendWSMessage_10000(1, _811Pu01Mach, _811EndSeries, 1, 57, 64, _811EndSeries, 57, 57, 0);
+
+ break;
+
+ case 35:
+ case 36:
+ case 37:
+ case 40:
+ case 64:
+ case 65:
+ case 76:
+ case 77:
+ case 82:
+ case 83:
+ case 84:
+ case 91:
+ case 92:
+ case 1050:
+ case 1100:
+ case 1110:
+ default:
+ break;
+ }
}
} // namespace Rooms
diff --git a/engines/m4/riddle/rooms/section8/room811.h b/engines/m4/riddle/rooms/section8/room811.h
index 38deb2ec5f2..11bb93fac4f 100644
--- a/engines/m4/riddle/rooms/section8/room811.h
+++ b/engines/m4/riddle/rooms/section8/room811.h
@@ -41,7 +41,7 @@ public:
private:
int32 _field0 = 0;
-
+
int32 _811BA01Series = 0;
int32 _811BA02Series = 0;
int32 _811BA03Series = 0;
@@ -49,10 +49,12 @@ private:
int32 _811BA05Series = 0;
int32 _811MC01Series = 0;
int32 _811RP01Series = 0;
-
+
machine *_811BaronMach = nullptr;
machine *_811McMach = nullptr;
+ machine *_811Pu01Mach = nullptr;
machine *_811RipleyMach = nullptr;
+ int32 _811EndSeries;
};
} // namespace Rooms
More information about the Scummvm-git-logs
mailing list