[Scummvm-git-logs] scummvm master -> 6f1288b0169b66a160edb4e121518a9969a89584
Strangerke
noreply at scummvm.org
Mon Nov 25 08:56:03 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:
6f1288b016 M4: RIDDLE: room 701 - Some renaming of mode & should variables
Commit: 6f1288b0169b66a160edb4e121518a9969a89584
https://github.com/scummvm/scummvm/commit/6f1288b0169b66a160edb4e121518a9969a89584
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-11-25T09:55:55+01:00
Commit Message:
M4: RIDDLE: room 701 - Some renaming of mode & should variables
Changed paths:
engines/m4/riddle/rooms/section7/room701.cpp
engines/m4/riddle/rooms/section7/room701.h
diff --git a/engines/m4/riddle/rooms/section7/room701.cpp b/engines/m4/riddle/rooms/section7/room701.cpp
index 56ad3afc4b6..6f0638ca7ff 100644
--- a/engines/m4/riddle/rooms/section7/room701.cpp
+++ b/engines/m4/riddle/rooms/section7/room701.cpp
@@ -113,9 +113,9 @@ void Room701::parser() {
if (_G(kernel).trigger == 1) {
int32 who = conv_whos_talking();
if (who == 1)
- _field98 = 1103;
+ _field98_should = 1103;
else if (who <= 0)
- _field6C = 2102;
+ _field6C_should = 2102;
conv_resume(conv_get_handle());
} else {
@@ -127,8 +127,8 @@ void Room701::parser() {
player_set_commands_allowed(false);
_field88 = true;
_field72_triggerNum = -1;
- _field94 = 1000;
- _field98 = 1100;
+ _field94_mode = 1000;
+ _field98_should = 1100;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 102, nullptr);
_G(kernel).trigger_mode = KT_PARSE;
@@ -696,8 +696,8 @@ void Room701::daemon() {
break;
case 101:
- _field94 = 1000;
- _field98 = 1105;
+ _field94_mode = 1000;
+ _field98_should = 1105;
break;
@@ -711,19 +711,19 @@ void Room701::daemon() {
break;
case 103:
- switch (_field94) {
+ switch (_field94_mode) {
case 1000:
- switch (_field98) {
+ switch (_field98_should) {
case 1100:
player_set_commands_allowed(false);
- _field68 = 2000;
- _field6C = 2100;
+ _field68_mode = 2000;
+ _field6C_should = 2100;
kernel_timing_trigger(1, 110, nullptr);
player_update_info(_G(my_walker), &_G(player_info));
_safariShadow3Mach = series_place_sprite("SAFARI SHADOW 3", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
ws_hide_walker(_G(my_walker));
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 256, false, triggerMachineByHashCallback, "rip talks agent");
- _field98 = 1103;
+ _field98_should = 1103;
sendWSMessage_10000(1, _ripTalksAgentMach, _ripTrekTalkerPos3Series, 5, 5, 102, _ripTrekTalkerPos3Series, 5, 5, 1);
conv_load("conv701a", 10, 10, 101);
_lastInventoryCheck = inventoryCheck();
@@ -784,7 +784,7 @@ void Room701::daemon() {
terminateMachine(_ripTalksAgentMach);
terminateMachine(_safariShadow3Mach);
ws_unhide_walker(_G(my_walker));
- _field6C = 2103;
+ _field6C_should = 2103;
kernel_timing_trigger(1, 2700, nullptr);
break;
@@ -796,16 +796,16 @@ void Room701::daemon() {
break;
case 3000:
- switch (_field98) {
+ switch (_field98_should) {
case 3100:
player_set_commands_allowed(false);
- _field98 = 3101;
+ _field98_should = 3101;
break;
case 3101:
terminateMachine(_agentPoshExpressMach02);
sendWSMessage_10000(1, _agentPoshExpressMach, _agentGetTelegramSeries, 1, 60, 102, _agentGetTelegramSeries, 60, 60, 0);
- _field98 = 3102;
+ _field98_should = 3102;
break;
@@ -814,26 +814,26 @@ void Room701::daemon() {
inv_give_to_player("MESSAGE LOG");
sendWSMessage_10000(1, _agentPoshExpressMach, _agentGetTelegramSeries, 69, 69, -1, _agentGetTelegramSeries, 69, 69, 0);
kernel_timing_trigger(1, 2204, nullptr);
- _field98 = 3103;
+ _field98_should = 3103;
break;
case 3103:
sendWSMessage_10000(1, _agentPoshExpressMach, _agentGetTelegramSeries, 71, 71, -1, _agentGetTelegramSeries, 71, 71, 0);
- _field98 = 3103;
+ _field98_should = 3103;
break;
case 3105:
sendWSMessage_10000(1, _agentPoshExpressMach, _agentGetTelegramSeries, 71, 86, 102, _agentGetTelegramSeries, 86, 86, 0);
- _field98 = 3107;
+ _field98_should = 3107;
break;
case 3106:
digi_play("950_S06", 2, 255, -1, 950);
sendWSMessage_10000(1, _agentPoshExpressMach, _agentGetTelegramSeries, 70, 71, -1, _agentGetTelegramSeries, 71, 71, 0);
- _field98 = 3103;
+ _field98_should = 3103;
break;
@@ -842,7 +842,7 @@ void Room701::daemon() {
kernel_timing_trigger(1, 2501, nullptr);
_field130 = false;
} else {
- _field98 = 3108;
+ _field98_should = 3108;
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 11, 1, 102, _701rp01Series, 1, 1, 0);
sendWSMessage_10000(1, _agentPoshExpressMach, _agentTalkLoopTjSeries, 1, 1, -1, _agentTalkLoopTjSeries, 1, 1, 0);
@@ -863,11 +863,11 @@ void Room701::daemon() {
break;
case 3500:
- switch (_field98) {
+ switch (_field98_should) {
case 3501:
_agentSignsForMoneySeries = series_load("AGENT SIGNS FOR MONEY", -1, nullptr);
- _field98 = 3502;
- _field6C = 2101;
+ _field98_should = 3502;
+ _field6C_should = 2101;
terminateMachine(_ripTalksAgentMach);
player_set_commands_allowed(false);
@@ -878,15 +878,15 @@ void Room701::daemon() {
break;
case 3502:
- _field6C = 2103;
+ _field6C_should = 2103;
kernel_timing_trigger(1, 103, nullptr);
- _field98 = 3504;
+ _field98_should = 3504;
break;
case 3503:
terminateMachine(_agentPoshExpressMach02);
- _field98 = 3504;
+ _field98_should = 3504;
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 1, 11, 102, _701rp01Series, 11, 11, 0);
@@ -895,7 +895,7 @@ void Room701::daemon() {
case 3504:
terminateMachine(_agentPoshExpressMach);
terminateMachine(_agentPoshExpressMach02);
- _field98 = 3505;
+ _field98_should = 3505;
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 256, false, triggerMachineByHashCallback, "rip talks agent");
sendWSMessage_10000(1, _ripTalksAgentMach, _agentSignsForMoneySeries, 1, 70, 102, _agentSignsForMoneySeries, 70, 70, 0);
@@ -903,28 +903,28 @@ void Room701::daemon() {
case 3505:
digi_play("950_S06", 2, 255, -1, 950);
- _field98 = 3506;
+ _field98_should = 3506;
sendWSMessage_10000(1, _ripTalksAgentMach, _agentSignsForMoneySeries, 70, 94, 102, _agentSignsForMoneySeries, 94, 94, 0);
break;
case 3506:
terminateMachine(_ripTalksAgentMach);
- _field98 = 3507;
+ _field98_should = 3507;
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 11, 1, 102, _701rp01Series, 1, 1, 0);
_agentPoshExpressMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 1792, false, triggerMachineByHashCallback, "agent posh express");
- _field68 = 2000;
- _field6C = 2102;
+ _field68_mode = 2000;
+ _field6C_should = 2102;
sendWSMessage_10000(1, _agentPoshExpressMach, _agentTalkLoopTjSeries, 13, 13, 110, _agentTalkLoopTjSeries, 13, 13, 0);
break;
case 3507:
- _field94 = 1000;
+ _field94_mode = 1000;
inv_give_to_player("US DOLLARS");
terminateMachine(_agentPoshExpressMach02);
- _field98 = 1103;
+ _field98_should = 1103;
player_update_info(_G(my_walker), &_G(player_info));
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 256, false, triggerMachineByHashCallback, "rip talks agent");
sendWSMessage_10000(1, _ripTalksAgentMach, _ripTrekTalkerPos3Series, 5, 5, 102, _ripTrekTalkerPos3Series, 5, 5, 0);
@@ -939,17 +939,17 @@ void Room701::daemon() {
break;
case 3600:
- switch (_field98) {
+ switch (_field98_should) {
case 3601:
_agentExchangeMoneySeries = series_load("AGENT EXCHANGE MONEY", -1, nullptr);
sendWSMessage_10000(1, _ripTalksAgentMach, _ripTrekTalkerPos3Series, 1, 5, -1, _ripTrekHandTalkPos3Series, 1, 5, 1);
- _field98 = 3602;
+ _field98_should = 3602;
digi_play_loop(_convDigiName_2.c_str(), 1, 255, 103, -1);
break;
case 3602:
- _field98 = 3604;
+ _field98_should = 3604;
sendWSMessage_10000(1, _ripTalksAgentMach, _ripTrekTalkerPos3Series, 5, 5, 103, _ripTrekTalkerPos3Series, 5, 5, 1);
break;
@@ -957,7 +957,7 @@ void Room701::daemon() {
case 3603:
terminateMachine(_agentPoshExpressMach);
terminateMachine(_agentPoshExpressMach02);
- _field98 = 3605;
+ _field98_should = 3605;
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 256, false, triggerMachineByHashCallback, "rip talks agent");
sendWSMessage_10000(1, _ripTalksAgentMach, _agentExchangeMoneySeries, 1, 52, 102, _agentExchangeMoneySeries, 52, 52, 0);
@@ -966,20 +966,20 @@ void Room701::daemon() {
case 3604:
terminateMachine(_ripTalksAgentMach);
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
- _field98 = 3603;
+ _field98_should = 3603;
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 1, 11, 102, _701rp01Series, 11, 11, 0);
break;
case 3605:
digi_play("950_S06", 2, 255, -1, 959);
- _field98 = 33605;
+ _field98_should = 33605;
sendWSMessage_10000(1, _ripTalksAgentMach, _agentExchangeMoneySeries, 52, 19, 102, _agentExchangeMoneySeries, 19, 19, 0);
break;
case 3606:
- _field98 = 3607;
+ _field98_should = 3607;
terminateMachine(_ripTalksAgentMach);
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 11, 1, 102, _701rp01Series, 1, 1, 0);
@@ -992,8 +992,8 @@ void Room701::daemon() {
inv_give_to_player("SIKKIMESE RUPEE");
terminateMachine(_agentPoshExpressMach02);
- _field94 = 1000;
- _field98 = 1103;
+ _field94_mode = 1000;
+ _field98_should = 1103;
player_update_info(_G(my_walker), &_G(player_info));
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 256, false, triggerMachineByHashCallback, "rip talks agent");
@@ -1005,7 +1005,7 @@ void Room701::daemon() {
case 33605:
digi_play("950_S06", 2, 255, -1, 950);
- _field98 = 3606;
+ _field98_should = 3606;
sendWSMessage_10000(1, _ripTalksAgentMach, _agentExchangeMoneySeries, 19, 1, 102, _agentExchangeMoneySeries, 1, 1, 0);
break;
@@ -1016,11 +1016,11 @@ void Room701::daemon() {
break;
case 3700:
- switch (_field98) {
+ switch (_field98_should) {
case 3701:
player_set_commands_allowed(false);
terminateMachine(_ripTalksAgentMach);
- _field98 = 3702;
+ _field98_should = 3702;
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 1, 11, 102, _701rp01Series, 11, 11, 0);
@@ -1029,7 +1029,7 @@ void Room701::daemon() {
case 3702:
terminateMachine(_agentPoshExpressMach);
terminateMachine(_agentPoshExpressMach02);
- _field98 = 3709;
+ _field98_should = 3709;
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 256, false, triggerMachineByHashCallback, "rip talks agent");
sendWSMessage_10000(1, _ripTalksAgentMach, _agentGiveParcelSeries, 1, 33, 102, _agentGiveParcelSeries, 33, 33, 0);
@@ -1091,9 +1091,9 @@ void Room701::daemon() {
}
_agentPoshExpressMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 1792, false, triggerMachineByHashCallback, "agent posh express");
- _field6C = 2102;
- _field68 = 2000;
- _field98 = 3705;
+ _field6C_should = 2102;
+ _field68_mode = 2000;
+ _field98_should = 3705;
kernel_timing_trigger(1, 102, nullptr);
sendWSMessage_10000(1, _agentPoshExpressMach, _agentTalkLoopTjSeries, 13, 13, 110, _agentTalkLoopTjSeries, 13, 13, 0);
@@ -1101,7 +1101,7 @@ void Room701::daemon() {
break;
case 3705:
- _field98 = 3706;
+ _field98_should = 3706;
terminateMachine(_ripTalksAgentMach);
_agentPoshExpressMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "agent posh express");
sendWSMessage_10000(1, _agentPoshExpressMach02, _701rp01Series, 11, 1, 102, _701rp01Series, 1, 1, 0);
@@ -1110,8 +1110,8 @@ void Room701::daemon() {
case 3706:
terminateMachine(_agentPoshExpressMach02);
- _field94 = 1000;
- _field98 = 98;
+ _field94_mode = 1000;
+ _field98_should = 98;
player_update_info(_G(my_walker), &_G(player_info));
_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 256, false, triggerMachineByHashCallback, "rip talks agent");
sendWSMessage_10000(1, _ripTalksAgentMach, _ripTrekTalkerPos3Series, 5, 5, 102, _ripTrekTalkerPos3Series, 5, 5, 0);
@@ -1120,7 +1120,7 @@ void Room701::daemon() {
break;
case 3709:
- _field98 = 3704;
+ _field98_should = 3704;
sendWSMessage_10000(1, _ripTalksAgentMach, _agentGiveParcelSeries, 34, 51, 102, _agentGiveParcelSeries, 51, 51, 0);
digi_play("950_S09", 2, 255, -1, 950);
@@ -1148,13 +1148,13 @@ void Room701::daemon() {
break;
case 111:
- if (_field68 != 2000)
+ if (_field68_mode != 2000)
return;
- switch (_field6C) {
+ switch (_field6C_should) {
case 2100:
sendWSMessage_10000(1, _agentPoshExpressMach, _agentTalkLoopTjSeries, 14, 14, 110, _agentTalkLoopTjSeries, 14, 14, 0);
- _field6C = 2102;
+ _field6C_should = 2102;
break;
@@ -1219,14 +1219,14 @@ void Room701::daemon() {
break;
case 2200:
- _field98 = 3100;
- _field94 = 3000;
+ _field98_should = 3100;
+ _field94_mode = 3000;
sendWSMessage_10000(1, _agentPoshExpressMach, _agentTalkLoopTjSeries, 13, 13, 102, _agentTalkLoopTjSeries, 13, 13, 0);
break;
case 2201:
- _field98 = 3103;
+ _field98_should = 3103;
kernel_timing_trigger(60, 2300, nullptr);
break;
@@ -1278,7 +1278,7 @@ void Room701::daemon() {
break;
case 2301:
- _field98 = 3106;
+ _field98_should = 3106;
kernel_timing_trigger(1, 2302, nullptr);
break;
@@ -1317,13 +1317,13 @@ void Room701::daemon() {
case 2306:
if (_field130) {
- _field94 = 3000;
- _field98 = 3105;
+ _field94_mode = 3000;
+ _field98_should = 3105;
kernel_timing_trigger(1, 102, nullptr);
} else {
--_field50_counter;
if (_field50_counter <= 0) {
- _field98 = 3106;
+ _field98_should = 3106;
kernel_timing_trigger(1, 2300, nullptr);
} else {
kernel_timing_trigger(1, 2307, nullptr);
@@ -1333,7 +1333,7 @@ void Room701::daemon() {
break;
case 2307:
- _field98 = 3105;
+ _field98_should = 3105;
kernel_timing_trigger(10, 102, nullptr);
break;
@@ -1439,12 +1439,12 @@ void Room701::conv701a() {
if (who <= 0) {
if (_conv701aNode == 3 && entry == 0) {
_convDigiName_1 = Common::String(digiName);
- _field94 = 3500;
- _field98 = 3501;
+ _field94_mode = 3500;
+ _field98_should = 3501;
return;
}
- _field6C = 2101;
+ _field6C_should = 2101;
} else if (who == 1) {
if (_conv701aNode == 1 && entry == 1) {
@@ -1463,33 +1463,33 @@ void Room701::conv701a() {
case 1:
if (entry == 3) {
_convDigiName_2 = Common::String(digiName);
- _field94 = 3600;
- _field98 = 3601;
+ _field94_mode = 3600;
+ _field98_should = 3601;
return;
}
- _field98 = 1102;
+ _field98_should = 1102;
break;
case 6:
if (entry == 0) {
- _field98 = 1102;
+ _field98_should = 1102;
digi_play(digiName, 1, 255, 1, -1);
_field90 = true;
return;
}
- _field98 = 1102;
+ _field98_should = 1102;
break;
case 11:
if (entry != 12) {
- _field94 = 3700;
- _field98 = 3701;
+ _field94_mode = 3700;
+ _field98_should = 3701;
return;
}
@@ -1497,7 +1497,7 @@ void Room701::conv701a() {
break;
default:
- _field98 = 1102;
+ _field98_should = 1102;
break;
}
}
diff --git a/engines/m4/riddle/rooms/section7/room701.h b/engines/m4/riddle/rooms/section7/room701.h
index 0efa69a5997..ca956976fdc 100644
--- a/engines/m4/riddle/rooms/section7/room701.h
+++ b/engines/m4/riddle/rooms/section7/room701.h
@@ -61,11 +61,11 @@ private:
bool _alreadyBeenHereFl = false;
int32 _field50_counter = 0;
- int32 _field68 = 0;
- int32 _field6C = 0;
+ int32 _field68_mode = 0;
+ int32 _field6C_should = 0;
int32 _field72_triggerNum = -1; // Useless : always -1
- int32 _field94 = 0;
- int32 _field98 = 0;
+ int32 _field94_mode = 0;
+ int32 _field98_should = 0;
int32 _field9E_triggerNum = -1; // Useless : always -1
int32 _conv701aNode = 0;
int32 _travelDest = 0;
More information about the Scummvm-git-logs
mailing list