[Scummvm-git-logs] scummvm master -> b4eeeb91f4dbaaca0c119eb0c2dfd49a19246fcc
dreammaster
noreply at scummvm.org
Wed Nov 20 06:44:25 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:
658d084ce4 M4: RIDDLE: mode/should cleanups for room 501
b4eeeb91f4 M4: RIDDLE: Fixes for start of Twelvetrees conv
Commit: 658d084ce4048b1894c6fcd6db70716381c9a12c
https://github.com/scummvm/scummvm/commit/658d084ce4048b1894c6fcd6db70716381c9a12c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-19T22:44:20-08:00
Commit Message:
M4: RIDDLE: mode/should cleanups for room 501
Changed paths:
engines/m4/riddle/rooms/section5/room501.cpp
engines/m4/riddle/rooms/section5/room501.h
diff --git a/engines/m4/riddle/rooms/section5/room501.cpp b/engines/m4/riddle/rooms/section5/room501.cpp
index eac2c613679..5650c457805 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -94,7 +94,7 @@ void Room501::daemon() {
switch (_G(kernel).trigger) {
case 501:
- _val9 = 1;
+ _ripleyMode = 1;
_xyzzy1 = 0;
_xyzzy2 = -1;
_xyzzy3 = 0;
@@ -106,25 +106,25 @@ void Room501::daemon() {
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, 0,
triggerMachineByHashCallback, "Rip Delta Machine State");
- switch (_val3) {
+ switch (_ripleyShould) {
case 3:
ws_hide_walker();
sendWSMessage_10000(1, _ripley, _ripTalkLoop, 2, 11, 502,
_ripTalkLoop, 11, 11, 0);
- _val9 = 3;
+ _ripleyMode = 3;
break;
case 4:
sendWSMessage_10000(1, _ripley, _ripTalkLoop, 11, 11, 502,
_ripTalkLoop, 11, 11, 0);
- _val9 = 3;
+ _ripleyMode = 3;
break;
case 5:
sendWSMessage_10000(1, _ripley, _ripTalkLoop, 11, 11, 502,
_ripTalkLoop, 11, 11, 0);
- _val3 = 3;
- _val9 = 3;
+ _ripleyShould = 3;
+ _ripleyMode = 3;
break;
default:
@@ -133,19 +133,19 @@ void Room501::daemon() {
break;
case 502:
- if (_val9 == 3 && _val3 == 3 && _val6 != -1) {
+ if (_ripleyMode == 3 && _ripleyShould == 3 && _val6 != -1) {
kernel_trigger_dispatchx(_val6);
_val6 = -1;
}
- if (_val9 == 7 && _val3 == 7 && _xyzzy2 != -1) {
+ if (_ripleyMode == 7 && _ripleyShould == 7 && _xyzzy2 != -1) {
kernel_trigger_dispatchx(_xyzzy2);
_xyzzy2 = -1;
}
- if (_val9 == 13 && _val3 == 13 && _xyzzy4 != -1) {
+ if (_ripleyMode == 13 && _ripleyShould == 13 && _xyzzy4 != -1) {
kernel_trigger_dispatchx(_xyzzy4);
_xyzzy4 = -1;
}
- if (_val9 == 3 && _val3 == 4 && _val7 != -1) {
+ if (_ripleyMode == 3 && _ripleyShould == 4 && _val7 != -1) {
kernel_trigger_dispatchx(_val7);
_val7 = -1;
}
@@ -159,7 +159,7 @@ void Room501::daemon() {
terminateMachineAndNull(_shadow);
_val5 = 0;
- if (_val9 == 3)
+ if (_ripleyMode == 3)
series_unload(_ripTalkLoop);
} else {
@@ -168,11 +168,11 @@ void Room501::daemon() {
break;
case 503:
- switch (_val9) {
+ switch (_ripleyMode) {
case 3:
- switch (_val3) {
+ switch (_ripleyShould) {
case 2:
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(508);
kernel_timing_trigger(1, 502);
break;
@@ -190,50 +190,50 @@ void Room501::daemon() {
digi_play((_val4 == 1) ? "501x02" : "501x03", 1);
sendWSMessage_10000(1, _ripley, _ripSeries1, 1, 85, 502,
_ripSeries1, 85, 85, 0);
- _val3 = 7;
- _val9 = 7;
+ _ripleyShould = 7;
+ _ripleyMode = 7;
break;
case 9:
_xyzzy5 = 1;
sendWSMessage_10000(1, _ripley, _ripParcelExchange, 90, 1, 502,
_ripParcelExchange, 1, 1, 0);
- _val3 = 10;
+ _ripleyShould = 10;
break;
case 10:
digi_play("COM084", 1, 255, -1, 997);
kernel_timing_trigger(1, 505);
sendWSMessage_10000(1, _ripley, _ripParcelExchange, 1, 1, 502,
_ripParcelExchange, 1, 1, 0);
- _val3 = 3;
+ _ripleyShould = 3;
break;
case 11:
_xyzzy5 = 1;
sendWSMessage_10000(1, _ripley, _ripParcelExchange, 1, 90, 502,
_ripParcelExchange, 90, 90, 0);
- _val3 = 12;
+ _ripleyShould = 12;
break;
case 12:
kernel_timing_trigger(1, 505);
sendWSMessage_10000(1, _ripley, _ripParcelExchange, 1, 1, 502,
_ripParcelExchange, 1, 1, 0);
- _val3 = 3;
+ _ripleyShould = 3;
break;
case 13:
sendWSMessage_10000(1, _ripley, _ripTalkLoop, 11, 2, 502,
_ripTalkLoop, 2, 2, 0);
- _val9 = 13;
+ _ripleyMode = 13;
break;
case 14:
_xyzzy5 = 1;
sendWSMessage_10000(1, _ripley, _ripMoneyExchange, 1, 85, 502,
_ripMoneyExchange, 85, 85, 0);
- _val3 = 15;
+ _ripleyShould = 15;
break;
case 15:
kernel_timing_trigger(1, 505);
sendWSMessage_10000(1, _ripley, _ripMoneyExchange, 85, 85, 502,
_ripMoneyExchange, 85, 85, 0);
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(551);
if (!inv_player_has("PERUVIAN INTI"))
@@ -245,13 +245,13 @@ void Room501::daemon() {
digi_play(conv_sound_to_play(), 1);
sendWSMessage_10000(1, _ripley, _ripSignsPaper, 1, 91, 502,
_ripSignsPaper, 91, 91, 0);
- _val3 = 17;
+ _ripleyShould = 17;
break;
case 17:
sendWSMessage_10000(1, _ripley, _ripSignsPaper, 85, 92, -1,
_ripSignsPaper, 90, 92, 4);
digi_play("950_S35", 1, 255, 502);
- _val3 = 18;
+ _ripleyShould = 18;
break;
case 18:
if (!_paper) {
@@ -262,14 +262,14 @@ void Room501::daemon() {
kernel_timing_trigger(1, 505);
sendWSMessage_10000(1, _ripley, _ripSignsPaper, 92, 111, 502,
_ripSignsPaper, 111, 111, 0);
- _val3 = 3;
+ _ripleyShould = 3;
break;
case 19:
_ripMoneyExchange = series_load("MONEY XCHANGE");
_xyzzy5 = 1;
sendWSMessage_10000(1, _ripley, _ripMoneyExchange, 61, 85, 502,
_ripMoneyExchange, 85, 85, 0);
- _val3 = 20;
+ _ripleyShould = 20;
break;
case 20:
if (!inv_player_has("US DOLLARS"))
@@ -278,7 +278,7 @@ void Room501::daemon() {
kernel_timing_trigger(1, 505);
sendWSMessage_10000(1, _ripley, _ripSignsPaper, 85, 85, 502,
_ripSignsPaper, 85, 85, 0);
- _val3 = 3;
+ _ripleyShould = 3;
break;
default:
break;
@@ -286,13 +286,13 @@ void Room501::daemon() {
break;
case 7:
- switch (_val3) {
+ switch (_ripleyShould) {
case 3:
kernel_timing_trigger(1, 504);
sendWSMessage_10000(1, _ripley, _ripSeries1, 86, 94, 502,
_ripTalkLoop, 11, 11, 0);
- _val3 = 3;
- _val9 = 3;
+ _ripleyShould = 3;
+ _ripleyMode = 3;
break;
case 7:
sendWSMessage_10000(1, _ripley, _ripSeries1, 85, 85, 502,
@@ -301,7 +301,7 @@ void Room501::daemon() {
case 8:
sendWSMessage_10000(1, _ripley, _ripSeries1, 85, 86, 502,
_ripSeries1, 86, 85, 0);
- _val3 = 7;
+ _ripleyShould = 7;
break;
default:
break;
@@ -309,11 +309,11 @@ void Room501::daemon() {
break;
case 13:
- switch (_val3) {
+ switch (_ripleyShould) {
case 3:
sendWSMessage_10000(1, _ripley, _ripTalkLoop, 2, 11, 502,
_ripTalkLoop, 11, 11, 0);
- _val9 = 3;
+ _ripleyMode = 3;
break;
case 13:
sendWSMessage_10000(1, _ripley, _ripTalkLoop, 11, 2, 502,
@@ -330,8 +330,8 @@ void Room501::daemon() {
break;
case 504:
- _xyzzy8 = 1;
- _val1 = 1;
+ _agentMode = 1;
+ _agentShould = 1;
_xyzzy6 = -1;
_xyzzy7 = -1;
_xyzzy5 = -1;
@@ -339,12 +339,12 @@ void Room501::daemon() {
triggerMachineByHashCallback, "Agent at Desk");
sendWSMessage_10000(1, _agent, _agentTalkLoop, 1, 1, 506,
_agentTalkLoop, 1, 1, 0);
- _xyzzy8 = 1;
+ _agentMode = 1;
break;
case 505:
- _xyzzy8 = 5;
- _val1 = 5;
+ _agentMode = 5;
+ _agentShould = 5;
_xyzzy6 = -1;
_xyzzy7 = -1;
_xyzzy5 = -1;
@@ -355,11 +355,11 @@ void Room501::daemon() {
break;
case 506:
- if (_val1 == 1 && _xyzzy8 == 1 && _xyzzy6 != -1) {
+ if (_agentShould == 1 && _agentMode == 1 && _xyzzy6 != -1) {
kernel_trigger_dispatchx(_xyzzy6);
_xyzzy6 = -1;
}
- if (_val1 == 5 && _xyzzy8 == 5 && _xyzzy7 != -1) {
+ if (_agentShould == 5 && _agentMode == 5 && _xyzzy7 != -1) {
kernel_trigger_dispatchx(_xyzzy7);
_xyzzy7 = -1;
}
@@ -371,9 +371,9 @@ void Room501::daemon() {
break;
case 507:
- switch (_xyzzy8) {
+ switch (_agentMode) {
case 1:
- switch (_val1) {
+ switch (_agentShould) {
case 1:
sendWSMessage_10000(1, _agent, _agentTalkLoop, 1, 1, 506,
_agentTalkLoop, 1, 1, 0);
@@ -389,20 +389,20 @@ void Room501::daemon() {
ws_hide_walker();
sendWSMessage_10000(1, _agent, _ripMoneyExchange, 1, 86, 506,
_ripMoneyExchange, 1, 1, 0);
- _val1 = 4;
+ _agentShould = 4;
break;
case 4:
ws_unhide_walker();
sendWSMessage_10000(1, _agent, _agentTalkLoop, 1, 1, 506,
_agentTalkLoop, 1, 1, 0);
series_unload(_ripMoneyExchange);
- _val1 = 1;
+ _agentShould = 1;
player_set_commands_allowed(true);
break;
case 5:
sendWSMessage_10000(1, _agent, _agentStridesForward, 1, 15, 506,
_agentStridesForward, 15, 15, 0);
- _xyzzy8 = 5;
+ _agentMode = 5;
break;
default:
break;
@@ -410,11 +410,11 @@ void Room501::daemon() {
break;
case 5:
- switch (_val1) {
+ switch (_agentShould) {
case 1:
sendWSMessage_10000(1, _agent, _agentStridesForward, 15, 1, 506,
_agentTalkLoop, 1, 1, 0);
- _xyzzy8 = 1;
+ _agentMode = 1;
break;
case 5:
@@ -495,7 +495,7 @@ void Room501::daemon() {
break;
case 509:
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(510);
break;
@@ -503,7 +503,7 @@ void Room501::daemon() {
if (_val8 == 1) {
kernel_timing_trigger(1, 512);
} else {
- _val3 = 13;
+ _ripleyShould = 13;
_xyzzy4 = kernel_trigger_create(511);
}
break;
@@ -550,26 +550,26 @@ void Room501::daemon() {
break;
case 514:
- _val1 = 1;
- _val3 = 3;
+ _agentShould = 1;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(515);
kernel_timing_trigger(2, 501);
break;
case 515:
- _val3 = 4;
+ _ripleyShould = 4;
digi_play("501r01", 1, 255, 516);
break;
case 516:
- _val3 = 3;
- _val1 = 2;
+ _ripleyShould = 3;
+ _agentShould = 2;
digi_play("501x01", 1, 255, 517);
break;
case 517:
_val4 = checkFlags(true);
- _val1 = 1;
+ _agentShould = 1;
if (_val4 > 0) {
_ripSeries1 = series_load("TELEGRAM XCHANGE");
@@ -580,7 +580,7 @@ void Room501::daemon() {
break;
case 518:
- _val3 = 6;
+ _ripleyShould = 6;
_xyzzy2 = kernel_trigger_create(526);
break;
@@ -589,7 +589,7 @@ void Room501::daemon() {
break;
case 523:
- _val3 = 13;
+ _ripleyShould = 13;
_xyzzy4 = kernel_trigger_create(524);
break;
@@ -643,7 +643,7 @@ void Room501::daemon() {
break;
case 527:
- _val3 = 7;
+ _ripleyShould = 7;
_xyzzy2 = kernel_trigger_create(528);
break;
@@ -681,7 +681,7 @@ void Room501::daemon() {
kernel_timing_trigger(1, 534);
} else {
if (--_val4 > 0) {
- _val3 = 8;
+ _ripleyShould = 8;
_xyzzy2 = kernel_trigger_create(526);
} else {
kernel_timing_trigger(1, 533);
@@ -690,23 +690,23 @@ void Room501::daemon() {
break;
case 533:
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(523);
break;
case 534:
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(535);
break;
case 535:
_ripParcelExchange = series_load("PARCEL XCHANGE");
- _val1 = 5;
+ _agentShould = 5;
_xyzzy7 = kernel_trigger_create(536);
break;
case 536:
- _val3 = 9;
+ _ripleyShould = 9;
_xyzzy7 = kernel_trigger_create(537);
break;
@@ -714,7 +714,7 @@ void Room501::daemon() {
if (!inv_player_has("ROMANOV EMERALD"))
inv_give_to_player("ROMANOV EMERALD");
- _val1 = 1;
+ _agentShould = 1;
_xyzzy6 = kernel_trigger_create(538);
break;
@@ -725,22 +725,22 @@ void Room501::daemon() {
case 539:
_ripParcelExchange = series_load("PARCEL XCHANGE");
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(540);
break;
case 540:
- _val1 = 5;
+ _agentShould = 5;
_xyzzy7 = kernel_trigger_create(540);
break;
case 541:
- _val3 = 11;
+ _ripleyShould = 11;
_val6 = kernel_trigger_create(542);
break;
case 542:
- _val1 = 1;
+ _agentShould = 1;
_xyzzy6 = kernel_trigger_create(543);
break;
@@ -794,12 +794,12 @@ void Room501::daemon() {
case 549:
player_set_commands_allowed(false);
_ripMoneyExchange = series_load("MONEY XCHANGE");
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(550);
break;
case 550:
- _val3 = 14;
+ _ripleyShould = 14;
break;
case 551:
@@ -807,7 +807,7 @@ void Room501::daemon() {
break;
case 552:
- _val1 = 1;
+ _agentShould = 1;
_xyzzy6 = kernel_trigger_create(553);
break;
@@ -819,9 +819,9 @@ void Room501::daemon() {
case 555:
_puffinExchange = series_load("PUFFIN XCHANGE");
- _val1 = 5;
+ _agentShould = 5;
kernel_timing_trigger(1, 501);
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(556);
break;
@@ -875,7 +875,7 @@ void Room501::daemon() {
case 565:
kernel_timing_trigger(1, 501);
- _val3 = 4;
+ _ripleyShould = 4;
_val7 = kernel_trigger_create(566);
break;
@@ -910,7 +910,7 @@ void Room501::daemon() {
case 572:
kernel_timing_trigger(1, 501);
- _val3 = 4;
+ _ripleyShould = 4;
_val7 = kernel_trigger_create(573);
break;
@@ -948,7 +948,7 @@ void Room501::daemon() {
case 578:
kernel_timing_trigger(1, 505);
kernel_timing_trigger(1, 501);
- _val3 = 5;
+ _ripleyShould = 5;
_val6 = kernel_trigger_create(579);
break;
@@ -960,7 +960,7 @@ void Room501::daemon() {
if (!inv_player_has("CLOCK FACING"))
inv_give_to_player("CLOCK FACING");
- _val1 = 1;
+ _agentShould = 1;
_xyzzy6 = kernel_trigger_create(580);
break;
@@ -969,13 +969,13 @@ void Room501::daemon() {
break;
case 581:
- _val1 = 1;
- _val3 = 4;
+ _agentShould = 1;
+ _ripleyShould = 4;
digi_play("501R39", 1, 255, 582);
break;
case 582:
- _val3 = 13;
+ _ripleyShould = 13;
_xyzzy4 = kernel_trigger_create(583);
break;
@@ -989,9 +989,9 @@ void Room501::daemon() {
break;
case 585:
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(586);
- _val1 = 5;
+ _agentShould = 5;
break;
case 586:
@@ -999,22 +999,22 @@ void Room501::daemon() {
break;
case 587:
- _val3 = 16;
+ _ripleyShould = 16;
_val6 = kernel_trigger_create(588);
break;
case 588:
- _val1 = 5;
+ _agentShould = 5;
_xyzzy7 = kernel_trigger_create(589);
break;
case 589:
- _val3 = 19;
+ _ripleyShould = 19;
_val6 = kernel_trigger_create(590);
break;
case 590:
- _val1 = 1;
+ _agentShould = 1;
_xyzzy6 = kernel_trigger_create(591);
break;
@@ -1026,9 +1026,9 @@ void Room501::daemon() {
case 594:
_puffinExchange = series_load("PUFFIN XCHANGE");
- _val1 = 5;
+ _agentShould = 5;
kernel_timing_trigger(1, 501);
- _val3 = 3;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(595);
break;
@@ -1071,18 +1071,18 @@ void Room501::daemon() {
case 603:
kernel_timing_trigger(1, 505);
kernel_timing_trigger(1, 501);
- _val3 = 5;
+ _ripleyShould = 5;
_val6 = kernel_trigger_create(604);
break;
case 604:
terminateMachineAndNull(_deltaPuffinMachine);
- _val1 = 1;
+ _agentShould = 1;
_xyzzy6 = kernel_trigger_create(605);
break;
case 605:
- _val3 = 13;
+ _ripleyShould = 13;
_xyzzy4 = kernel_trigger_create(606);
break;
@@ -1094,12 +1094,12 @@ void Room501::daemon() {
break;
case 610:
- _val3 = 4;
+ _ripleyShould = 4;
digi_play("COM084", 1, 255, 611, 997);
break;
case 611:
- _val3 = 3;
+ _ripleyShould = 3;
break;
case 612:
@@ -1264,14 +1264,14 @@ void Room501::parser() {
case -1:
case 666:
player_set_commands_allowed(false);
- _val1 = 1;
- _val3 = 3;
+ _agentShould = 1;
+ _ripleyShould = 3;
_val6 = kernel_trigger_create(2);
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(2, 501);
break;
case 2:
- _val3 = 2;
+ _ripleyShould = 2;
player_set_commands_allowed(true);
break;
default:
@@ -1299,7 +1299,7 @@ void Room501::conv501a() {
if (_G(kernel).trigger == 1) {
if (who <= 0) {
- _val1 = 1;
+ _agentShould = 1;
if (node == 1 && (entry == 2 || entry == 3)) {
_G(kernel).trigger_mode = KT_DAEMON;
@@ -1322,7 +1322,7 @@ void Room501::conv501a() {
conv_set_box_xy(10, 10);
}
- _val3 = 3;
+ _ripleyShould = 3;
if (node == 2)
_convEntry = entry;
if (node == 8 && entry == 0)
@@ -1339,7 +1339,7 @@ void Room501::conv501a() {
return;
}
- _val1 = 2;
+ _agentShould = 2;
} else if (who == 1) {
if (node == 14 && entry != 12) {
diff --git a/engines/m4/riddle/rooms/section5/room501.h b/engines/m4/riddle/rooms/section5/room501.h
index 13a42f92f3e..384c55c82ed 100644
--- a/engines/m4/riddle/rooms/section5/room501.h
+++ b/engines/m4/riddle/rooms/section5/room501.h
@@ -47,15 +47,15 @@ private:
int _ripParcelExchange = 0;
int _ripMoneyExchange = 0;
int _ripSignsPaper = 0;
- int _val1 = 0;
+ int _agentShould = 0;
int _val2 = 0;
- int _val3 = 0;
+ int _ripleyShould = 0;
int _val4 = 0;
int _val5 = 0;
int _val6 = 0;
int _val7 = 0;
int _val8 = 0;
- int _val9 = 0;
+ int _ripleyMode = 0;
int _xyzzy1 = 0;
int _xyzzy2 = 0;
int _xyzzy3 = 0;
@@ -63,7 +63,7 @@ private:
int _xyzzy5 = 0;
int _xyzzy6 = 0;
int _xyzzy7 = 0;
- int _xyzzy8 = 0;
+ int _agentMode = 0;
int _xyzzy9 = 0;
int _xyzzy10 = 0;
int _itemsCount = 0;
Commit: b4eeeb91f4dbaaca0c119eb0c2dfd49a19246fcc
https://github.com/scummvm/scummvm/commit/b4eeeb91f4dbaaca0c119eb0c2dfd49a19246fcc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-19T22:44:20-08:00
Commit Message:
M4: RIDDLE: Fixes for start of Twelvetrees conv
Changed paths:
engines/m4/riddle/rooms/section6/room603.cpp
engines/m4/riddle/rooms/section6/room603.h
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index 71b92be5542..eea7f803ff0 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -223,8 +223,8 @@ void Room603::init() {
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 2, 2, 200, _ttDigShirtOff, 2, 2, 0);
_trigger1 = 200;
- _val7 = 1;
- _val8 = 0;
+ _ttMode = 1;
+ _ttShould = 0;
_val9 = 0;
_val10 = 0;
@@ -239,8 +239,8 @@ void Room603::init() {
_door = series_show("603DOOR", 0xf00, 16);
hotspot_set_active("wire", false);
_ttDigShirtOn = series_load("TT DIG LOOP SHIRT ON");
- _val7 = 6;
- _val8 = 17;
+ _ttMode = 6;
+ _ttShould = 17;
_val9 = 0;
_val10 = 0;
hotspot_set_active("person in pit", false);
@@ -333,9 +333,9 @@ void Room603::daemon() {
break;
case 201:
- switch (_val7) {
+ switch (_ttMode) {
case 1:
- switch (_val8) {
+ switch (_ttShould) {
case 0:
switch (imath_ranged_rand(1, 3)) {
case 1:
@@ -346,14 +346,14 @@ void Room603::daemon() {
case 2:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 1, 1, 200,
_ttDigShirtOff, 1, 1, 0);
- _val7 = 2;
+ _ttMode = 2;
sendWSMessage_190000(_tt, imath_ranged_rand(10, 60));
playRandomDigi(8);
break;
default:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 1, 14, 200,
_ttDigShirtOff, 15, 15, 0);
- _val7 = 3;
+ _ttMode = 3;
sendWSMessage_190000(_tt, imath_ranged_rand(7, 10));
playRandomDigi(8);
break;
@@ -376,12 +376,12 @@ void Room603::daemon() {
break;
case 2:
- switch (_val8) {
+ switch (_ttShould) {
case 0:
if (imath_ranged_rand(1, 2) == 1) {
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 1, 1, 200,
_ttDigShirtOff, 1, 1, 0);
- _val7 = 1;
+ _ttMode = 1;
} else {
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 1, 1, 200,
_ttDigShirtOff, 1, 1, 0);
@@ -392,7 +392,7 @@ void Room603::daemon() {
case 5:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 1, 1, 200,
_ttDigShirtOff, 1, 1, 0);
- _val7 = 1;
+ _ttMode = 1;
break;
default:
@@ -401,7 +401,7 @@ void Room603::daemon() {
break;
case 3:
- switch (_val8) {
+ switch (_ttShould) {
case 0:
switch (imath_ranged_rand(1, 3)) {
case 1:
@@ -412,13 +412,13 @@ void Room603::daemon() {
case 2:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 14, 1, 200,
_ttDigShirtOff, 2, 2, 0);
- _val7 = 1;
+ _ttMode = 1;
sendWSMessage_190000(_tt, imath_ranged_rand(7, 10));
break;
case 3:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 16, 24, 200,
_ttDigShirtOff, 24, 24, 0);
- _val7 = 4;
+ _ttMode = 4;
sendWSMessage_190000(_tt, imath_ranged_rand(7, 10));
break;
default:
@@ -429,13 +429,13 @@ void Room603::daemon() {
case 5:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 14, 1, 200,
_ttDigShirtOff, 2, 2, 0);
- _val7 = 1;
+ _ttMode = 1;
break;
case 22:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 14, 1, 200,
_ttDigShirtOff, 2, 2, 0);
- _val7 = 1;
+ _ttMode = 1;
break;
default:
@@ -444,18 +444,18 @@ void Room603::daemon() {
break;
case 4:
- switch (_val8) {
+ switch (_ttShould) {
case 0:
if (imath_ranged_rand(1, 2) == 1) {
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 24, 16, 200,
_ttDigShirtOff, 15, 15, 0);
- _val7 = 3;
+ _ttMode = 3;
sendWSMessage_190000(_tt, imath_ranged_rand(7, 10));
playRandomDigi(8);
} else {
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 24, 24, 200,
_ttDigShirtOff, 24, 24, 0);
- _val7 = 1;
+ _ttMode = 1;
sendWSMessage_190000(_tt, imath_ranged_rand(10, 60));
}
break;
@@ -463,13 +463,13 @@ void Room603::daemon() {
case 5:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 24, 16, 200,
_ttDigShirtOff, 15, 15, 0);
- _val7 = 3;
+ _ttMode = 3;
break;
case 22:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 14, 16, 200,
_ttDigShirtOff, 15, 15, 0);
- _val7 = 3;
+ _ttMode = 3;
break;
default:
@@ -493,12 +493,12 @@ void Room603::daemon() {
case 203:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 43, 43, -1,
_ttDigShirtOff, 43, 43, 1);
- _num1 = 13;
+ _ripleyShould = 13;
digi_play("603r13", 1, 255, 204);
break;
case 204:
- _num1 = 14;
+ _ripleyShould = 14;
kernel_timing_trigger(1, 300);
_G(kernel).trigger_mode = KT_PARSE;
conv_load("conv603a", 10, 10, 747);
@@ -541,9 +541,9 @@ void Room603::daemon() {
break;
case 301:
- switch (_num2) {
+ switch (_ripleyMode) {
case 0:
- switch (_num1) {
+ switch (_ripleyShould) {
case 0:
sendWSMessage_10000(1, _ripley, _ripTalk, 1, 1, 300, _ripTalk, 1, 1, 0);
break;
@@ -552,7 +552,7 @@ void Room603::daemon() {
case 14:
sendWSMessage_10000(1, _ripley, _ripHandsBehindBack, 1, 15, 300,
_ripHandsBehindBack, 15, 15, 0);
- _num2 = 8;
+ _ripleyMode = 8;
sendWSMessage_190000(_ripley, 4);
break;
@@ -564,19 +564,19 @@ void Room603::daemon() {
case 6:
sendWSMessage_10000(1, _ripley, _ripTwoHandTalk, 1, 6, 300,
_ripTwoHandTalk, 6, 6, 0);
- _num2 = 6;
+ _ripleyMode = 6;
break;
case 9:
sendWSMessage_10000(1, _ripley, _ripHandChin, 1, 16, 300,
_ripHandChin, 16, 16, 0);
- _num2 = 9;
+ _ripleyMode = 9;
break;
case 10:
sendWSMessage_10000(1, _ripley, _ripHandsHips, 1, 12, 300,
_ripHandsHips, 12, 12, 0);
- _num2 = 10;
+ _ripleyMode = 10;
break;
case 11:
@@ -598,18 +598,18 @@ void Room603::daemon() {
break;
case 6:
- if (_num1 == 6) {
+ if (_ripleyShould == 6) {
sendWSMessage_10000(1, _ripley, _ripTwoHandTalk, 6, 6, 300,
_ripTwoHandTalk, 6, 6, 0);
} else {
sendWSMessage_10000(1, _ripley, _ripTwoHandTalk, 6, 1, 300,
_ripTwoHandTalk, 1, 1, 0);
- _num2 = 0;
+ _ripleyMode = 0;
}
break;
case 8:
- switch (_num1) {
+ switch (_ripleyShould) {
case 1:
terminateMachineAndNull(_tt);
terminateMachineAndNull(_shirt);
@@ -618,7 +618,7 @@ void Room603::daemon() {
hotspot_set_active("SLEEVE", true);
hotspot_set_active("SHIRT", false);
sendWSMessage_10000(1, _ripley, _rp02, 1, 28, 305, _rp02, 28, 28, 0);
- _num1 = 0;
+ _ripleyShould = 0;
sendWSMessage_1e0000(_ripley, 0, 0);
sendWSMessage_1f0000(_ripley, 0, 0);
sendWSMessage_200000(_ripley, 100);
@@ -627,7 +627,7 @@ void Room603::daemon() {
case 2:
sendWSMessage_10000(1, _ripley, _rp04, 1, 31, 330, _rp04, 31, 31, 0);
- _num1 = 0;
+ _ripleyShould = 0;
break;
case 8:
@@ -642,42 +642,42 @@ void Room603::daemon() {
sendWSMessage_200000(_ripley, 100);
sendWSMessage_1f0000(_ripley, 0, 0);
sendWSMessage_210000(_ripley, 100);
- _num2 = 13;
+ _ripleyMode = 13;
break;
default:
sendWSMessage_10000(1, _ripley, _ripHandsBehindBack, 15, 1, 300,
_rp04, 1, 1, 0);
sendWSMessage_190000(_ripley, 4);
- _num2 = 0;
+ _ripleyMode = 0;
break;
}
break;
case 9:
- if (_num1 == 9) {
+ if (_ripleyShould == 9) {
sendWSMessage_10000(1, _ripley, _ripHandChin, 16, 16, 300,
_ripHandChin, 16, 16, 0);
} else {
sendWSMessage_10000(1, _ripley, _ripHandChin, 16, 1, 300,
_ripHandChin, 1, 1, 0);
- _num2 = 0;
+ _ripleyMode = 0;
}
break;
case 10:
- if (_num1 == 10) {
+ if (_ripleyShould == 10) {
sendWSMessage_10000(1, _ripley, _ripHandsHips, 12, 12, 300,
_ripHandsHips, 12, 12, 0);
} else {
sendWSMessage_10000(1, _ripley, _ripHandsHips, 12, 1, 300,
_rp04, 1, 1, 0);
- _num2 = 0;
+ _ripleyMode = 0;
}
break;
case 13:
- switch (_num1) {
+ switch (_ripleyShould) {
case 5:
case 13:
sendWSMessage_10000(1, _ripley, _rp01, 36, 36, -1, _rp01, 36, 38, 1);
@@ -701,7 +701,7 @@ void Room603::daemon() {
_ripHandsBehindBack, 15, 15, 300);
sendWSMessage_1e0000(_ripley, 0, 0);
sendWSMessage_200000(_ripley, 100);
- _num2 = 8;
+ _ripleyMode = 8;
break;
}
break;
@@ -716,16 +716,16 @@ void Room603::daemon() {
_ripHandsBehindBack, 15, 15, 0);
sendWSMessage_1e0000(_ripley, 0, 0);
sendWSMessage_200000(_ripley, 100);
- _num2 = 13;
- _num1 = 14;
- digi_play("603r12", 1, 255, 203);
+ _ripleyMode = 13;
+ _ripleyShould = 14;
+ digi_play("603r12", 1, 255, 303);
break;
case 303:
- if (_val8 == 22)
+ if (_ttShould == 22)
kernel_timing_trigger(1, 22);
else
- _val8 = 5;
+ _ttShould = 5;
break;
case 304:
@@ -735,8 +735,7 @@ void Room603::daemon() {
break;
case 305:
- sendWSMessage_10000(1, _ripley, _ripHandChin, 29, 36, 309,
- _rp02, 36, 36, 0);
+ sendWSMessage_10000(1, _ripley, _rp02, 29, 36, 309, _rp02, 36, 36, 0);
sendWSMessage_1e0000(_ripley, 0, 0);
sendWSMessage_200000(_ripley, 100);
digi_play("603_s01", 2, 255, 306);
@@ -810,8 +809,8 @@ void Room603::daemon() {
_tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, 0,
triggerMachineByHashCallback, "tt");
sendWSMessage_10000(1, _tt, _ttD01, 1, 1, 400, _ttD01, 1, 1, 0);
- _val8 = 6;
- _val7 = 6;
+ _ttShould = 6;
+ _ttMode = 6;
_ttShadow = series_show("tt walker shadow 4", 0xf00, 0, -1, -1, 0, 53, 291, 293);
series_unload(_rp01);
series_unload(_rp02);
@@ -833,9 +832,9 @@ void Room603::daemon() {
break;
case 401:
- switch (_val7) {
+ switch (_ttMode) {
case 6:
- switch (_val8) {
+ switch (_ttShould) {
case 6:
sendWSMessage_10000(1, _tt, _ttD01, 1, 1, 400, _ttD01, 1, 1, 0);
break;
@@ -853,18 +852,18 @@ void Room603::daemon() {
case 11:
case 12:
sendWSMessage_10000(1, _tt, _ttD01, 61, 76, 400, _ttD01, 77, 77, 1);
- _val7 = 12;
+ _ttMode = 12;
break;
case 13:
sendWSMessage_10000(1, _tt, _ttD01, 96, 121, 400, _ttD01, 1, 1, 1);
- _val8 = 6;
+ _ttShould = 6;
break;
case 14:
case 15:
sendWSMessage_10000(1, _tt, _ttD01, 85, 93, 400, _ttD01, 93, 93, 1);
- _val7 = 15;
+ _ttMode = 15;
break;
case 16:
@@ -879,7 +878,7 @@ void Room603::daemon() {
if (imath_ranged_rand(1, 2) == 1) {
sendWSMessage_10000(1, _tt, _ttD01, 61, 76, 400, _ttD01, 77, 77, 1);
- _val7 = 12;
+ _ttMode = 12;
} else {
sendWSMessage_10000(1, _tt, _ttD01, 1, 1, 400, _ttD01, 1, 1, 0);
}
@@ -900,7 +899,7 @@ void Room603::daemon() {
break;
case 12:
- switch (_val8) {
+ switch (_ttShould) {
case 11:
sendWSMessage_10000(1, _tt, _ttD01, 77, 77, -1, _ttD01, 77, 84, 4);
sendWSMessage_1a0000(_tt, 13);
@@ -916,7 +915,7 @@ void Room603::daemon() {
if (imath_ranged_rand(1, 2) == 1) {
sendWSMessage_10000(1, _tt, _ttD01, 76, 61, 400, _ttD01, 1, 1, 0);
- _val7 = 6;
+ _ttMode = 6;
} else {
sendWSMessage_10000(1, _tt, _ttD01, 77, 77, 400, _ttD01, 77, 77, 0);
}
@@ -932,17 +931,17 @@ void Room603::daemon() {
break;
case 15:
- switch (_val8) {
+ switch (_ttShould) {
case 15:
sendWSMessage_10000(1, _tt, _ttD01, 93, 93, 400, _ttD01, 93, 93, 0);
break;
default:
sendWSMessage_10000(1, _tt, _ttD01, 93, 85, 400, _ttD01, 1, 1, 0);
- _val7 = 6;
+ _ttMode = 6;
- if (_val8 == 14)
- _val8 = 6;
+ if (_ttShould == 14)
+ _ttShould = 6;
break;
}
break;
@@ -990,7 +989,7 @@ void Room603::daemon() {
case 411:
case 511:
- _num1 = 12;
+ _ripleyShould = 12;
kernel_timing_trigger(1, 300);
break;
@@ -1015,14 +1014,14 @@ void Room603::daemon() {
break;
case 501:
- switch (_val7) {
+ switch (_ttMode) {
case 6:
- switch (_val8) {
+ switch (_ttShould) {
case 7:
case 8:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 11, 13, 500,
_ttDigShirtOn, 13, 13, 0);
- _val7 = 18;
+ _ttMode = 18;
break;
case 17:
@@ -1055,7 +1054,7 @@ void Room603::daemon() {
case 21:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 11, 13, 500,
_ttDigShirtOn, 13, 13, 0);
- _val7 = 18;
+ _ttMode = 18;
break;
default:
@@ -1064,7 +1063,7 @@ void Room603::daemon() {
break;
case 7:
- switch (_val8) {
+ switch (_ttShould) {
case 7:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 38, 38, 500,
_ttDigShirtOn, 38, 38, 0);
@@ -1086,7 +1085,7 @@ void Room603::daemon() {
} else {
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 66, 85, 500,
_ttDigShirtOn, 1, 1, 0);
- _val7 = 6;
+ _ttMode = 6;
}
} else {
kernel_timing_trigger(13, 500);
@@ -1109,18 +1108,18 @@ void Room603::daemon() {
default:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 66, 85, 500,
_ttDigShirtOn, 1, 1, 0);
- _val7 = 6;
+ _ttMode = 6;
break;
}
break;
case 12:
- switch (_val8) {
+ switch (_ttShould) {
case 7:
case 8:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 17, 38, 500,
_ttDigShirtOn, 38, 38, 0);
- _val7 = 7;
+ _ttMode = 7;
break;
case 17:
@@ -1135,7 +1134,7 @@ void Room603::daemon() {
case 2:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 13, 11, 500,
_ttDigShirtOn, 1, 1, 0);
- _val7 = 6;
+ _ttMode = 6;
playRandomDigi(4);
break;
case 3:
@@ -1143,7 +1142,7 @@ void Room603::daemon() {
_val10 = 0;
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 17, 38, 500,
_ttDigShirtOn, 38, 38, 0);
- _val7 = 7;
+ _ttMode = 7;
} else {
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 13, 13, 500,
_ttDigShirtOn, 13, 13, 0);
@@ -1160,7 +1159,7 @@ void Room603::daemon() {
case 21:
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 17, 38, 500,
_ttDigShirtOn, 38, 38, 0);
- _val7 = 7;
+ _ttMode = 7;
break;
default:
@@ -1211,7 +1210,7 @@ void Room603::daemon() {
break;
case 531:
- _num1 = 12;
+ _ripleyShould = 12;
break;
case 532:
@@ -1222,8 +1221,9 @@ void Room603::daemon() {
sendWSMessage_10000(_tt, 519, 244, 3, 532, 0);
break;
- // TODO: Various
default:
+ if (_G(kernel).trigger < 9999)
+ error("TODO: Unhandled daemon trigger");
break;
}
@@ -1232,9 +1232,9 @@ void Room603::daemon() {
if (_G(player_info).y < 284 && !_val3 && !_G(flags)[V203]) {
_val3 = 1;
- _val8 = 22;
+ _ttShould = 22;
_G(kernel).call_daemon_every_loop = false;
- _val7 = 1;
+ _ttMode = 1;
kernel_timing_trigger(1, 200, KT_DAEMON, KT_PARSE);
player_set_commands_allowed(false);
}
@@ -1266,20 +1266,20 @@ void Room603::parser() {
} else if (player_said("conv603b")) {
conv603b();
} else if (_G(kernel).trigger == 747) {
- if (_val8 != 20) {
+ if (_ttShould != 20) {
unloadSeries();
_val9 = 1000;
- _num1 = 11;
- _val8 = 17;
+ _ripleyShould = 11;
+ _ttShould = 17;
}
} else if (_G(kernel).trigger == 748) {
- if (_val8 == 21) {
+ if (_ttShould == 21) {
disable_player_commands_and_fade_init(749);
} else {
unloadSeries();
_val9 = 1000;
- _num1 = 11;
- _val8 = 17;
+ _ripleyShould = 11;
+ _ttShould = 17;
}
} else if (_G(kernel).trigger == 749) {
digi_unload("603_S02");
@@ -1290,7 +1290,7 @@ void Room603::parser() {
digi_play_loop("950_s28a", 3, 90);
_G(game).setRoom(608);
_G(flags)[V203] = 6;
- } else if (player_said("talk to", "person it pit")) {
+ } else if (player_said("talk to", "person in pit")) {
switch (_G(kernel).trigger) {
case -1:
case 666:
@@ -1308,12 +1308,12 @@ void Room603::parser() {
triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _ripley, _rp01, 1, 15, 302, _rp01, 15, 15, 0);
- sendWSMessage_1e0000(0, 0);
+ sendWSMessage_1e0000(_ripley, 0, 0);
sendWSMessage_200000(_ripley, 100);
_G(kernel).trigger_mode = KT_PARSE;
- _num2 = 0;
- _num1 = 0;
+ _ripleyMode = 0;
+ _ripleyShould = 0;
_G(flags)[V203] = 1;
_val5 = 1;
hotspot_set_active("person in pit", false);
@@ -1337,8 +1337,8 @@ void Room603::parser() {
sendWSMessage_10000(1, _ripley, _ripTalk, 1, 1, 300, _ripTalk, 1, 1, 0);
sendWSMessage_190000(_ripley, 4);
_G(kernel).trigger_mode = KT_PARSE;
- _num2 = 0;
- _num1 = 0;
+ _ripleyMode = 0;
+ _ripleyShould = 0;
conv_load("conv603a", 10, 10, 747);
conv_set_shading(65);
@@ -1357,9 +1357,9 @@ void Room603::parser() {
sendWSMessage_10000(1, _ripley, _ripTalk, 1, 1, 300, _ripTalk, 1, 1, 0);
sendWSMessage_190000(_ripley, 4);
_G(kernel).trigger_mode = KT_PARSE;
- _num2 = 0;
- _num1 = 0;
- _val8 = 7;
+ _ripleyMode = 0;
+ _ripleyShould = 0;
+ _ttShould = 7;
if (_G(flags)[V203] <= 1) {
conv_load("conv603a", 10, 10, 747);
@@ -1399,9 +1399,9 @@ void Room603::parser() {
// No implementation
} else if (takeFlag && player_said_any("shirt", "pole") && !_G(flags)[V203]) {
player_set_commands_allowed(false);
- _val8 = 22;
+ _ttMode = 1;
+ _ttShould = 22;
_G(kernel).call_daemon_every_loop = false;
- _val7 = 1;
kernel_timing_trigger(1, 200, KT_DAEMON, KT_PARSE);
_ripAction = series_load("RIP MED REACH 1HAND POS2");
setGlobals1(_ripAction, 1, 15, 15, 15);
@@ -1415,18 +1415,18 @@ void Room603::parser() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- _val8 = _val5 ? 12 : 7;
+ _ttShould = _val5 ? 12 : 7;
_ripAction = series_load("RIP TREK HAT TIP POS4");
kernel_timing_trigger(60, 2);
break;
case 2:
- _val8 = _val5 ? 11 : 8;
+ _ttShould = _val5 ? 11 : 8;
digi_play("603t06", 1, 255, 3);
break;
case 3:
- _val8 = 17;
+ _ttShould = 17;
_val9 = 5000;
kernel_timing_trigger(1, _val5 ? 400 : 500, KT_DAEMON, KT_PARSE);
setGlobals1(_ripAction, 1, 8, 8, 8);
@@ -1576,31 +1576,31 @@ void Room603::conv603a() {
if (node == 23) {
if (_val5) {
_pu01 = series_stream("603pu03", 5, 0, 30);
- _val8 = 6;
+ _ttShould = 6;
if (_trigger1)
kernel_timing_trigger(1, _trigger1, KT_DAEMON, KT_PARSE);
} else {
_pu01 = series_stream("603pu03a", 5, 0, 30);
- _val8 = 7;
+ _ttShould = 7;
kernel_timing_trigger(1, 500, KT_DAEMON, KT_PARSE);
}
} else if (_val5) {
if (node == 3 && (entry == 1 || entry == 2)) {
// No implementation
} else if ((node == 6 || node == 27) && entry == 0) {
- _val8 = 12;
+ _ttShould = 12;
kernel_timing_trigger(1, 400, KT_DAEMON, KT_PARSE);
conv_resume();
} else if ((node == 3 && entry == 7) ||
(node == 3 && entry == 8)) {
// No implementation
} else if (node == 25 && entry == 3) {
- _val8 = 20;
+ _ttShould = 20;
kernel_timing_trigger(1, 400, KT_DAEMON, KT_PARSE);
conv_resume();
} else if (node == 3 && entry == 4) {
- _val8 = 16;
+ _ttShould = 16;
kernel_timing_trigger(1, 400, KT_DAEMON, KT_PARSE);
conv_resume();
} else if (node == 0 || node == 1 || node == 2) {
@@ -1608,14 +1608,14 @@ void Room603::conv603a() {
_ttDigShirtOff, 43, 43, 0);
conv_resume();
} else {
- _val8 = 6;
+ _ttShould = 6;
if (_trigger1)
kernel_timing_trigger(1, _trigger1, KT_DAEMON, KT_PARSE);
conv_resume();
}
} else {
- _val8 = (node == 25 && entry == 3) ? 20 : 7;
+ _ttShould = (node == 25 && entry == 3) ? 20 : 7;
kernel_timing_trigger(1, 500, KT_DAEMON, KT_PARSE);
conv_resume();
}
@@ -1623,7 +1623,7 @@ void Room603::conv603a() {
if (node == 3 && entry == 0) {
// No implementation
} else if (node == 0 || node == 1 || node == 2) {
- _num1 = 14;
+ _ripleyShould = 14;
kernel_timing_trigger(1, 300, KT_DAEMON, KT_PARSE);
conv_resume();
} else if (node == 3 && entry == 6) {
@@ -1638,10 +1638,10 @@ void Room603::conv603a() {
(node == 7)) {
conv_resume();
} else if (node == 12 && entry == 1) {
- _num1 = 0;
+ _ripleyShould = 0;
conv_resume();
} else if (_val2) {
- if (_num1 == 5)
+ if (_ripleyShould == 5)
kernel_timing_trigger(1, 300, KT_DAEMON, KT_PARSE);
conv_resume();
} else {
@@ -1654,11 +1654,11 @@ void Room603::conv603a() {
case 2:
series_stream_break_on_frame(_pu01, 16, 40);
- digi_play(sound, 1);
+ digi_play(sound, 1, 255, 1);
break;
case 3:
- ws_hide_walker();
+ ws_hide_walker(_tt);
series_play("603tt07", 0, 0, 4, 6);
break;
@@ -1669,7 +1669,7 @@ void Room603::conv603a() {
break;
case 5:
- ws_unhide_walker();
+ ws_unhide_walker(_tt);
sendWSMessage_10000(_tt, 501, 236, 8, 7, 1);
break;
@@ -1730,22 +1730,22 @@ void Room603::conv603a() {
_ripHandsBehindBack, 15, 15, 0);
sendWSMessage_190000(_ripley, 4);
_G(kernel).trigger_mode = KT_PARSE;
- _num2 = 8;
- _num1 = 8;
+ _ripleyMode = 8;
+ _ripleyShould = 8;
break;
case 20:
- _num1 = 10;
+ _ripleyShould = 10;
break;
case 21:
- _val8 = 14;
+ _ttShould = 14;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, _trigger1);
break;
case 22:
- _val8 = 13;
+ _ttShould = 13;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, _trigger1);
break;
@@ -1760,76 +1760,76 @@ void Room603::conv603a() {
case 40:
conv_resume();
- digi_play(sound, 1);
+ digi_play(sound, 1, 255, 1);
break;
default:
if (sound) {
if (who <= 0) {
if (!_val5) {
- _val8 = 8;
+ _ttShould = 8;
} else if (node == 0 || node == 1 || node == 2) {
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 41, 43, -1,
_ttDigShirtOff, 41, 43, 0);
sendWSMessage_190000(_tt, 13);
sendWSMessage_1a0000(_tt, 13);
} else if (node == 12 && entry == 1) {
- _val8 = 8;
+ _ttShould = 8;
kernel_timing_trigger(200, 20);
kernel_timing_trigger(760, 21);
} else if (node == 12 && entry == 2) {
- _val8 = 8;
+ _ttShould = 8;
kernel_timing_trigger(210, 22);
} else if (node == 11 && entry == 0) {
- _val8 = 14;
+ _ttShould = 14;
} else if ((node == 27 && entry == 0) ||
(node == 6 && entry == 0)) {
- _val8 = 11;
+ _ttShould = 11;
} else if (node == 3 && entry == 7) {
digi_preload("17_04n08");
digi_preload("17_04n99");
_pu01 = series_stream("603pu01", 5, 0, 10);
series_stream_break_on_frame(_pu01, 6, 2);
} else {
- _val8 = 8;
+ _ttShould = 8;
}
} else if (who == 1) {
if (node == 3 && entry == 0) {
- _num1 = 1;
+ _ripleyShould = 1;
} else if (node == 3 && entry == 6) {
sendWSMessage_10000(_tt, 501, 234, 1, 3, 1);
} else if ((node == 4 && entry == 0) || (node == 7)) {
- _num1 = 8;
+ _ripleyShould = 8;
} else if (node == 0 || node == 1 || node == 2) {
- _num1 = 13;
+ _ripleyShould = 13;
} else if (node == 6 && entry == 0) {
- _num1 = 2;
+ _ripleyShould = 2;
} else if (node == 6 && entry == 1) {
- _num1 = 6;
+ _ripleyShould = 6;
} else if (node == 15 && entry == 0) {
- _num1 = 6;
+ _ripleyShould = 6;
} else if (node == 14 && entry == 0) {
- _num1 = 8;
+ _ripleyShould = 8;
} else if (node == 27 && entry == 0) {
- _num1 = 10;
+ _ripleyShould = 10;
} else if (node == 8 && entry == 0) {
- _num1 = 9;
+ _ripleyShould = 9;
} else if ((node == 11 && entry == 0) ||
(node == 25 && entry == 0)) {
- _num1 = 10;
+ _ripleyShould = 10;
} else if (node == 25 && entry == 2) {
- _num1 = 7;
+ _ripleyShould = 7;
} else if ((node == 12 && entry == 1) ||
(node == 7 && entry == 0)) {
- _num1 = 6;
+ _ripleyShould = 6;
} else if (node == 5 && entry == 0) {
- _num1 = 10;
+ _ripleyShould = 10;
} else if (_val2) {
- _num1 = 5;
+ _ripleyShould = 5;
}
}
- digi_play(sound, 1);
+ digi_play(sound, 1, 255, 1);
} else {
conv_resume();
@@ -1851,22 +1851,22 @@ void Room603::conv603b() {
_G(flags)[V038] = 1;
if (node == 10 || node == 12) {
- _val8 = 21;
+ _ttShould = 21;
kernel_timing_trigger(1, 500, KT_DAEMON, KT_PARSE);
return;
} else {
- _val8 = 7;
+ _ttShould = 7;
kernel_timing_trigger(1, 500, KT_DAEMON, KT_PARSE);
}
} else if (who == 1) {
if (node == 11 && entry == 1) {
- _val8 = 21;
+ _ttShould = 21;
kernel_timing_trigger(1, 500, KT_DAEMON, KT_PARSE);
- _num1 = 0;
+ _ripleyShould = 0;
kernel_timing_trigger(1, 300, KT_DAEMON, KT_PARSE);
return;
} else {
- _num1 = 0;
+ _ripleyShould = 0;
kernel_timing_trigger(1, 300, KT_DAEMON, KT_PARSE);
}
}
@@ -1876,9 +1876,9 @@ void Room603::conv603b() {
} else if (sound) {
if (node != 13 && node != 16) {
if (who <= 0)
- _val8 = 8;
+ _ttShould = 8;
else if (who == 1)
- _num1 = 5;
+ _ripleyShould = 5;
}
digi_play(sound, 1);
@@ -1947,7 +1947,7 @@ bool Room603::takeSleeve() {
case 1:
player_set_commands_allowed(false);
- _val8 = _val5 ? 12 : 7;
+ _ttShould = _val5 ? 12 : 7;
setGlobals1(_ripTalk, 1, 7, 1, 7, 1, 1, 1, 1, 1);
sendWSMessage_110000(-1);
digi_play("603r14", 1, 255, 2);
@@ -1955,12 +1955,12 @@ bool Room603::takeSleeve() {
case 2:
sendWSMessage_120000(-1);
- _val8 = _val5 ? 11 : 8;
+ _ttShould = _val5 ? 11 : 8;
digi_play("603t04", 1, 255, 3);
return true;
case 3:
- _val8 = _val5 ? 12 : 7;
+ _ttShould = _val5 ? 12 : 7;
kernel_timing_trigger(1, _val5 ? 400 : 500, KT_DAEMON, KT_PARSE);
sendWSMessage_110000(-1);
digi_play("603r14a", 1, 255, 5);
@@ -1968,12 +1968,12 @@ bool Room603::takeSleeve() {
case 5:
sendWSMessage_120000(-1);
- _val8 = _val5 ? 11 : 8;
+ _ttShould = _val5 ? 11 : 8;
digi_play("603t05", 1, 255, 6);
return true;
case 6:
- _val8 = 17;
+ _ttShould = 17;
kernel_timing_trigger(1, _val5 ? 400 : 500, KT_DAEMON, KT_PARSE);
sendWSMessage_150000(-1);
ws_walk(365, 298, nullptr, 666, 10);
@@ -2110,19 +2110,19 @@ bool Room603::takePole() {
case -1:
if (inv_object_is_here("pole")) {
player_set_commands_allowed(false);
- _val8 = _val5 ? 12 : 7;
+ _ttShould = _val5 ? 12 : 7;
_ripAction = series_load("RIP MED REACH 1HAND POS2");
return true;
}
break;
case 2:
- _val8 = _val5 ? 11 : 8;
+ _ttShould = _val5 ? 11 : 8;
digi_play("603t03", 1, 255, 3);
return true;
case 3:
- _val8 = 17;
+ _ttShould = 17;
_val9 = 5000;
_val5 = 0;
kernel_timing_trigger(1, _val5 ? 400 : 500, KT_DAEMON, KT_PARSE);
@@ -2170,19 +2170,19 @@ void Room603::enter() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- _val8 = _val5 ? 12 : 7;
+ _ttShould = _val5 ? 12 : 7;
_ripAction = series_load("rip trek med reach hand pos1");
setGlobals1(_ripAction, 1, 10, 10, 10);
sendWSMessage_110000(2);
break;
case 2:
- _val8 = _val5 ? 11 : 8;
+ _ttShould = _val5 ? 11 : 8;
digi_play("603t07", 1, 255, 3);
break;
case 3:
- _val8 = 17;
+ _ttShould = 17;
_val9 = 5000;
_val5 = 0;
kernel_timing_trigger(1, _val5 ? 400 : 500, KT_DAEMON, KT_PARSE);
@@ -2209,6 +2209,21 @@ void Room603::playRandomDigi(int max) {
digi_play(SOUNDS[num], 2);
}
+void Room603::syncGame(Common::Serializer &s) {
+ s.syncAsSint32LE(_val2);
+ s.syncAsSint32LE(_val3);
+ s.syncAsSint32LE(_val4);
+ s.syncAsSint32LE(_val5);
+ s.syncAsSint32LE(_val6);
+ s.syncAsSint32LE(_val9);
+ s.syncAsSint32LE(_val10);
+ s.syncAsSint32LE(_ripleyMode);
+ s.syncAsSint32LE(_ripleyShould);
+ s.syncAsSint32LE(_ttMode);
+ s.syncAsSint32LE(_ttShould);
+ s.syncAsSint32LE(_trigger1);
+}
+
} // namespace Rooms
} // namespace Riddle
} // namespace M4
diff --git a/engines/m4/riddle/rooms/section6/room603.h b/engines/m4/riddle/rooms/section6/room603.h
index dc8d788f009..1e5d6474e05 100644
--- a/engines/m4/riddle/rooms/section6/room603.h
+++ b/engines/m4/riddle/rooms/section6/room603.h
@@ -30,18 +30,18 @@ namespace Rooms {
class Room603 : public Room {
private:
- int _trigger1 = 0;
int _val2 = 0;
int _val3 = 0;
int _val4 = 0;
int _val5 = 0;
int _val6 = 0;
- int _val7 = 0;
- int _val8 = 0;
int _val9 = 0;
int _val10 = 0;
- int _num1 = 0;
- int _num2 = 0;
+ int _ripleyMode = 0;
+ int _ripleyShould = 0;
+ int _ttMode = 0;
+ int _ttShould = 0;
+ int _trigger1 = 0;
machine *_shed = nullptr;
machine *_shenWalker = nullptr;
machine *_kuangWalker = nullptr;
@@ -89,6 +89,7 @@ public:
void daemon() override;
void pre_parser() override;
void parser() override;
+ void syncGame(Common::Serializer &s) override;
};
} // namespace Rooms
More information about the Scummvm-git-logs
mailing list