[Scummvm-git-logs] scummvm master -> ed7a9d0b297772ecd37c4d5315b5a4f23d691dc6
dreammaster
noreply at scummvm.org
Wed Oct 23 05:52:32 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:
ed7a9d0b29 M4: RIDDLE: Some field cleanups for room 301
Commit: ed7a9d0b297772ecd37c4d5315b5a4f23d691dc6
https://github.com/scummvm/scummvm/commit/ed7a9d0b297772ecd37c4d5315b5a4f23d691dc6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-22T22:52:26-07:00
Commit Message:
M4: RIDDLE: Some field cleanups for room 301
Changed paths:
engines/m4/riddle/rooms/section3/room301.cpp
engines/m4/riddle/rooms/section3/room301.h
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index a8097b06752..ce121a4ea7c 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -52,8 +52,8 @@ void Room301::init() {
_val12 = 0;
}
- _val13 = 0;
- _val14 = 0;
+ _georgeShould = 0;
+ _georgeMode = 0;
_ripTrekHandTalk3 = series_load("rip trek hand talk pos3");
_ripTrekTalker3 = series_load("RIP TREK TALKER POS3");
@@ -105,13 +105,13 @@ void Room301::daemon() {
case 9:
_deskGuy = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
triggerMachineByHashCallback, "guy behind desk");
- _val13 = _val14 = 0;
+ _georgeShould = _georgeMode = 0;
sendWSMessage_10000(1, _deskGuy, _agentStander, 1,
1, 10, _agentStander, 1, 1, 0);
break;
case 10:
- if (!_val13 && _val14 && _val5 != -1) {
+ if (!_georgeShould && _georgeMode && _val5 != -1) {
kernel_trigger_dispatchx(_val5);
_val5 = -1;
@@ -124,8 +124,8 @@ void Room301::daemon() {
_val11 = 0;
}
if (_val10) {
- sendWSMessage_80000(_machine4);
- sendWSMessage_10000(11, _machine4, _ripTrekTravel, 10,
+ sendWSMessage_80000(_ripley);
+ sendWSMessage_10000(11, _ripley, _ripTrekTravel, 10,
10, 20, _ripTrekTravel, 10, 10, 0);
}
}
@@ -134,9 +134,9 @@ void Room301::daemon() {
break;
case 11:
- switch (_val13) {
+ switch (_georgeShould) {
case 0:
- switch (_val14) {
+ switch (_georgeMode) {
case 0:
val = imath_ranged_rand(1, 3);
++_val8;
@@ -153,12 +153,12 @@ void Room301::daemon() {
case 2:
sendWSMessage_10000(1, _deskGuy, _agentStander, 1, 7, 10,
_agentStander, 7, 7, 0);
- _val13 = _val14 = 3;
+ _georgeShould = _georgeMode = 3;
break;
case 3:
sendWSMessage_10000(1, _deskGuy, _agentTalk, 1, 6, 10,
_agentTalk, 6, 6, 0);
- _val13 = _val14 = 7;
+ _georgeShould = _georgeMode = 7;
_val8 = 0;
digi_play((imath_ranged_rand(1, 2) == 1) ? "950_s06" : "950_s07",
@@ -181,7 +181,7 @@ void Room301::daemon() {
case 6:
sendWSMessage_10000(1, _deskGuy, _agentStander, 1, 7, 10,
_agentStander, 7, 7, 0);
- _val13 = 3;
+ _georgeShould = 3;
_val8 = 0;
break;
@@ -190,35 +190,35 @@ void Room301::daemon() {
case 9:
sendWSMessage_10000(1, _deskGuy, _agentTalk, 1, 6, 10,
_agentTalk, 6, 6, 0);
- _val13 = 7;
+ _georgeShould = 7;
_val8 = 0;
break;
case 10:
sendWSMessage_10000(1, _deskGuy, _agentSalutes, 1, 28, 10,
_agentStander, 1, 1, 0);
- _val13 = _val14 = 0;
+ _georgeShould = _georgeMode = 0;
_val8 = 0;
break;
case 12:
- terminateMachineAndNull(_machine4);
+ terminateMachineAndNull(_ripley);
_val11 = 1;
sendWSMessage_10000(1, _deskGuy, _agentTakesMoney, 1, 52, 13,
_agentStander, 1, 1, 0);
- _val13 = _val14 = 0;
+ _georgeShould = _georgeMode = 0;
_val8 = 0;
- _val15 = 0;
+ _ripleyShould = 0;
break;
case 13:
- terminateMachineAndNull(_machine4);
+ terminateMachineAndNull(_ripley);
sendWSMessage_10000(1, _deskGuy, _agentSlidesPaper, 1, 49, 14,
_agentStander, 1, 1, 0);
break;
case 15:
- terminateMachineAndNull(_machine4);
+ terminateMachineAndNull(_ripley);
sendWSMessage_10000(1, _deskGuy, _agentSlidesPaper, 1, 49, 25,
_agentStander, 1, 1, 0);
break;
@@ -229,7 +229,7 @@ void Room301::daemon() {
break;
case 1:
- switch (_val14) {
+ switch (_georgeMode) {
case 1:
sendWSMessage_10000(1, _deskGuy, _agentCheckingList, 27, 27, 10,
_agentCheckingList, 27, 27, 0);
@@ -257,7 +257,7 @@ void Room301::daemon() {
break;
case 3:
- switch (_val14) {
+ switch (_georgeMode) {
case 3:
val = imath_ranged_rand(1, 2);
++_val8;
@@ -273,7 +273,7 @@ void Room301::daemon() {
} else {
sendWSMessage_10000(1, _deskGuy, _agentStander, 7, 1, 10,
_agentStander, 1, 1, 0);
- _val13 = _val14 = 0;
+ _georgeShould = _georgeMode = 0;
_val8 = 0;
}
break;
@@ -283,19 +283,19 @@ void Room301::daemon() {
case 6:
sendWSMessage_10000(1, _deskGuy, _agentStander, 8, 12, 10,
_agentStander, 12, 12, 0);
- _val13 = 4;
+ _georgeShould = 4;
break;
default:
sendWSMessage_10000(1, _deskGuy, _agentStander, 7, 1, 10,
_agentStander, 1, 1, 0);
- _val13 = 0;
+ _georgeShould = 0;
_val8 = 0;
break;
}
break;
case 4:
- switch (_val14) {
+ switch (_georgeMode) {
case 4:
sendWSMessage_10000(1, _deskGuy, _agentStander, 12,
12, 10, _agentStander, 12, 12, 0);
@@ -335,14 +335,14 @@ void Room301::daemon() {
default:
sendWSMessage(1, _deskGuy, _agentStander, 12,
8, 10, _agentStander, 7, 7, 0);
- _val13 = 3;
+ _georgeShould = 3;
_val8 = 0;
break;
}
break;
case 7:
- switch (_val14) {
+ switch (_georgeMode) {
case 7:
val = imath_ranged_rand(1, 2);
if (imath_ranged_rand(10, 40) <= _val8)
@@ -356,7 +356,7 @@ void Room301::daemon() {
} else if (val == 2) {
sendWSMessage_10000(1, _deskGuy, _agentTalk, 6, 1, 10,
_agentStander, 1, 1, 0);
- _val13 = _val14 = 0;
+ _georgeShould = _georgeMode = 0;
_val8 = 0;
digi_play((imath_ranged_rand(1, 2) == 1) ? "950_s06" : "950_s07",
@@ -373,13 +373,13 @@ void Room301::daemon() {
default:
sendWSMessage_10000(1, _deskGuy, _agentTalk, 6, 1, 10,
_agentStander, 1, 1, 0);
- _val13 = 0;
+ _georgeShould = 0;
break;
}
break;
case 8:
- switch (_val14) {
+ switch (_georgeMode) {
case 8:
sendWSMessage_10000(1, _deskGuy, _agentTalk, 15, 15, 10,
_agentTalk, 15, 15, 0);
@@ -396,13 +396,13 @@ void Room301::daemon() {
default:
sendWSMessage_10000(1, _deskGuy, _agentTalk, 15, 6, 10,
_agentTalk, 6, 6, 0);
- _val13 = 7;
+ _georgeShould = 7;
break;
}
break;
case 14:
- if (_val14 == 14) {
+ if (_georgeMode == 14) {
if (_soundName) {
_G(kernel).trigger_mode = KT_PARSE;
digi_play(_soundName, 1, 255, _val16);
@@ -416,7 +416,7 @@ void Room301::daemon() {
} else {
sendWSMessage_10000(1, _deskGuy, _agentSlidesPaper, 57, 76, 10,
_agentSlidesPaper, 76, 76, 0);
- _val13 = _val14 = 0;
+ _georgeShould = _georgeMode = 0;
_val8 = 0;
_val10 = 1;
_val11 = 1;
@@ -426,21 +426,22 @@ void Room301::daemon() {
break;
case 12:
- _machine4 = TriggerMachineByHash(triggerMachineByHashCallback, "rip");
- sendWSMessage_10000(1, _machine4, _ripTrekTravel, 10, 10, 20,
+ _ripley = TriggerMachineByHash(triggerMachineByHashCallback, "rip");
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel, 10, 10, 20,
_ripTrekTravel, 10, 10, 0);
- _val15 = _val19 = 0;
+ _ripleyShould = _val19 = 0;
kernel_timing_trigger(10, 10);
- _val14 = 4;
+ _georgeMode = 4;
_val8 = 0;
conv_resume();
break;
case 13:
- _machine4 = TriggerMachineByHash(triggerMachineByHashCallback, "rip in conv");
- sendWSMessage_10000(1, _machine4, _ripTrekTravel, 10, 10, 20,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ triggerMachineByHashCallback, "rip in conv");
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel, 10, 10, 20,
_ripTrekTravel, 10, 10, 0);
- _val15 = _val19 = 0;
+ _ripleyShould = _val19 = 0;
kernel_timing_trigger(10, 10);
break;
@@ -457,7 +458,7 @@ void Room301::daemon() {
break;
case 20:
- if (!_val19 && !_val15 && _val5 != -1) {
+ if (!_val19 && !_ripleyShould && _val5 != -1) {
kernel_trigger_dispatchx(_val5);
_val5 = -1;
@@ -466,7 +467,7 @@ void Room301::daemon() {
_val9 = 0;
}
if (_val10) {
- sendWSMessage_80000(_machine4);
+ sendWSMessage_80000(_ripley);
_val10 = 0;
}
}
@@ -476,32 +477,32 @@ void Room301::daemon() {
case 21:
if (!_val19) {
- switch (_val15) {
+ switch (_ripleyShould) {
case 0:
- sendWSMessage_10000(1, _machine4, _ripTrekTravel,
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel,
10, 10, 20, _ripTrekTravel, 10, 10, 0);
break;
case 1:
frame = imath_ranged_rand(11, 19);
- sendWSMessage_10000(1, _machine4, _ripTrekTravel,
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel,
frame, frame, 20, _ripTrekTravel, frame, frame, 0);
- sendWSMessage_190000(_machine4, 13);
- sendWSMessage_1a0000(_machine4, 13);
+ sendWSMessage_190000(_ripley, 13);
+ sendWSMessage_1a0000(_ripley, 13);
break;
case 2:
- sendWSMessage_10000(1, _machine4, _ripTrekTravel,
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel,
20, 26, 20, _ripTrekTravel, 10, 10, 0);
break;
case 3:
- sendWSMessage_10000(1, _machine4, _ripTrekTravel,
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel,
37, 50, 20, _ripTrekTravel, 10, 10, 0);
break;
case 4:
- sendWSMessage_10000(1, _machine4, _ripTrekTravel,
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel,
9, 1, 22, _ripTrekTravel, 1, 1, 0);
break;
@@ -519,7 +520,7 @@ void Room301::daemon() {
conv_export_value(conv_get_handle(), 2, 6);
conv_play(conv_get_handle());
- _val15 = 0;
+ _ripleyShould = 0;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 20);
break;
@@ -531,7 +532,7 @@ void Room301::daemon() {
break;
case 22:
- terminateMachineAndNull(_machine4);
+ terminateMachineAndNull(_ripley);
terminateMachineAndNull(_machine3);
ws_unhide_walker();
player_set_commands_allowed(true);
@@ -551,10 +552,10 @@ void Room301::daemon() {
case 27:
sendWSMessage_10000(1, _deskGuy, _agentTakesMoney, 52, 9, 28,
_agentTakesMoney, 9, 9, 0);
- _val14 = 4;
- _val13 = 4;
+ _georgeMode = 4;
+ _georgeShould = 4;
_val8 = 0;
- _val15 = 0;
+ _ripleyShould = 0;
break;
case 28:
@@ -574,13 +575,13 @@ void Room301::daemon() {
break;
case 53:
- _val14 = 6;
+ _georgeMode = 6;
_soundName = "301a01";
_val16 = 56;
break;
case 56:
- _val14 = 3;
+ _georgeMode = 3;
kernel_timing_trigger(1, 11);
player_set_commands_allowed(true);
break;
@@ -596,7 +597,7 @@ void Room301::daemon() {
break;
case 63:
- _val14 = 6;
+ _georgeMode = 6;
_val7 = KT_DAEMON;
_soundName = "301a01";
_val16 = 72;
@@ -604,7 +605,7 @@ void Room301::daemon() {
case 64:
if (_val12) {
- _val14 = 5;
+ _georgeMode = 5;
_soundName = (_val12 == 1) ? "301a03" : "301a04";
_val7 = KT_DAEMON;
_val16 = 71;
@@ -625,7 +626,7 @@ void Room301::daemon() {
if (_G(global301) >= 1) {
_G(global301) = 0;
sendWSMessage_140000(-1);
- _val14 = 0;
+ _georgeMode = 0;
_soundName = "301a04a";
_val16 = 70;
} else {
@@ -634,17 +635,17 @@ void Room301::daemon() {
break;
case 70:
- _val14 = 0;
+ _georgeMode = 0;
player_set_commands_allowed(true);
break;
case 71:
- _val14 = 0;
+ _georgeMode = 0;
kernel_timing_trigger(1, 999);
break;
case 72:
- _val14 = 4;
+ _georgeMode = 4;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 11);
_G(kernel).trigger_mode = KT_DAEMON;
@@ -733,15 +734,15 @@ void Room301::daemon() {
case 300:
terminateMachineAndNull(_deskGuy);
- _machine4 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
triggerMachineByHashCallback, "rip");
- sendWSMessage_10000(1, _machine4, _agentStander, 7,
+ sendWSMessage_10000(1, _ripley, _agentStander, 7,
1, 304, _agentStander, 1, 1, 0);
break;
case 304:
ws_hide_walker();
- sendWSMessage(1, _machine4, _agentTakesTelegram,
+ sendWSMessage(1, _ripley, _agentTakesTelegram,
1, 53, 305, _agentTakesTelegram, 53, 53, 0);
break;
@@ -751,23 +752,23 @@ void Room301::daemon() {
break;
case 320:
- sendWSMessage(1, _machine4, _agentTakesTelegram,
+ sendWSMessage(1, _ripley, _agentTakesTelegram,
54, 63, 322, _agentTakesTelegram, 63, 63, 0);
break;
case 322:
- sendWSMessage_10000(1, _machine4, _ripTrekTravel,
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel,
10, 1, 324, _ripTrekTravel, 1, 1, 0);
_deskGuy = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
triggerMachineByHashCallback, "guy behind desk");
- _val13 = 0;
- _val14 = 0;
+ _georgeShould = 0;
+ _georgeMode = 0;
sendWSMessage_10000(1, _deskGuy, _agentStander, 1,
1, 10, _agentStander, 1, 1, 0);
break;
case 324:
- terminateMachineAndNull(_machine4);
+ terminateMachineAndNull(_ripley);
ws_unhide_walker();
kernel_timing_trigger(1, 1000);
break;
@@ -876,7 +877,7 @@ void Room301::parser() {
bool takeFlag = player_said("take"); // edi
bool useFlag = player_said_any("push", "pull", "gear", "open", "close"); // esi
- if (player_said("con301a")) {
+ if (player_said("conv301a")) {
conv301a();
} else if (player_said("exit")) {
if (_G(flags)[GLB_TEMP_1]) {
@@ -938,14 +939,14 @@ void Room301::parser() {
break;
case 3:
sendWSMessage_140000(-1);
- _val14 = 5;
+ _georgeMode = 5;
_val6 = KT_PARSE;
_val7 = KT_PARSE;
_val16 = 4;
_soundName = "301a02";
break;
case 4:
- _val14 = 0;
+ _georgeMode = 0;
_val5 = kernel_trigger_create(5);
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 11);
@@ -966,8 +967,8 @@ void Room301::parser() {
digi_play("301r29", 1);
} else if (_G(kernel).trigger == 747) {
player_set_commands_allowed(false);
- _val14 = 0;
- _val15 = 4;
+ _georgeMode = 0;
+ _ripleyShould = 4;
if (_val1) {
switch (_val1) {
@@ -1000,15 +1001,15 @@ void Room301::parser() {
_machine3 = series_show("safari shadow 3", 0xf00, 0, -1, -1, 0,
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
- _machine4 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
_val19 = 0;
- _val15 = 5;
- sendWSMessage_10000(1, _machine4, _ripTrekTravel, 1, 9, 20,
+ _ripleyShould = 5;
+ sendWSMessage_10000(1, _ripley, _ripTrekTravel, 1, 9, 20,
_ripTrekTravel, 10, 10, 0);
- _val14 = 4;
+ _georgeMode = 4;
} else if (takeFlag && player_said("postcards")) {
digi_play("301r09", 1);
} else if (takeFlag && player_said("water cooler")) {
@@ -1037,14 +1038,14 @@ void Room301::conv301a() {
if (_G(kernel).trigger == 1 || !sound) {
if (who <= 0) {
if (node != 3) {
- _val14 = 4;
+ _georgeMode = 4;
conv_resume();
}
} else if (who == 1) {
if (node == 11) {
- _val14 = 12;
+ _georgeMode = 12;
} else if (node != 13) {
- _val15 = 0;
+ _ripleyShould = 0;
conv_resume();
} else {
conv_resume();
@@ -1055,20 +1056,20 @@ void Room301::conv301a() {
} else {
if (who <= 0) {
if (node == 3) {
- _val14 = 15;
+ _georgeMode = 15;
} else if (node != 2) {
- _val14 = imath_ranged_rand(5, 6);
+ _georgeMode = imath_ranged_rand(5, 6);
} else {
- _val14 = 2;
+ _georgeMode = 2;
_soundName = sound;
_val16 = 1;
return;
}
} else if (who == 1) {
if (node == 13)
- _val14 = 13;
+ _georgeMode = 13;
else
- _val15 = 1;
+ _ripleyShould = 1;
}
digi_play(sound, 1, 255, 1);
diff --git a/engines/m4/riddle/rooms/section3/room301.h b/engines/m4/riddle/rooms/section3/room301.h
index 31dfa252c29..6870b15ea22 100644
--- a/engines/m4/riddle/rooms/section3/room301.h
+++ b/engines/m4/riddle/rooms/section3/room301.h
@@ -42,9 +42,9 @@ private:
int _val10 = 0;
int _val11 = 0;
int _val12 = 0;
- int _val13 = 0;
- int _val14 = 0;
- int _val15 = 0;
+ int _georgeShould = 0;
+ int _georgeMode = 0;
+ int _ripleyShould = 0;
int _val16 = 0;
int _val17 = 0;
int _val18 = 0;
@@ -64,7 +64,7 @@ private:
machine *_deskGuy = nullptr;
machine *_machine2 = nullptr;
machine *_machine3 = nullptr;
- machine *_machine4 = nullptr;
+ machine *_ripley = nullptr;
const char *_digiSound1 = nullptr;
const char *_digiSound2 = nullptr;
const char *_digiSound3 = nullptr;
More information about the Scummvm-git-logs
mailing list