[Scummvm-git-logs] scummvm master -> 7e60f4138f93f9946ee0b77282c786ebd5d4d368
Strangerke
noreply at scummvm.org
Sun Mar 9 18:19:10 UTC 2025
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:
7e60f4138f M4: RIDDLE: Small cleanup while checking the hardcoded logic in rooms 303, 405 and in walker.cpp
Commit: 7e60f4138f93f9946ee0b77282c786ebd5d4d368
https://github.com/scummvm/scummvm/commit/7e60f4138f93f9946ee0b77282c786ebd5d4d368
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-09T19:18:56+01:00
Commit Message:
M4: RIDDLE: Small cleanup while checking the hardcoded logic in rooms 303, 405 and in walker.cpp
Changed paths:
engines/m4/riddle/rooms/section3/room303.cpp
engines/m4/riddle/rooms/section4/room405.cpp
engines/m4/riddle/walker.cpp
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 8b0ee8d1bd0..4eab8a469e9 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -2016,11 +2016,11 @@ void Room303::conv303b() {
}
void Room303::priestTalkCallback(frac16 myMessage, machine *sender) {
- Room303 *room = (Room303 *)g_engine->_activeRoom;
- const KernelTriggerType oldMode = _G(kernel).trigger_mode;
const int trigger = myMessage >> 16;
if (trigger > 0) {
+ Room303 *room = (Room303 *)g_engine->_activeRoom;
+ const KernelTriggerType oldMode = _G(kernel).trigger_mode;
_G(kernel).trigger_mode = room->_val12;
kernel_timing_trigger(1, trigger);
_G(kernel).trigger_mode = oldMode;
diff --git a/engines/m4/riddle/rooms/section4/room405.cpp b/engines/m4/riddle/rooms/section4/room405.cpp
index c314f8378d7..2f2431b4f86 100644
--- a/engines/m4/riddle/rooms/section4/room405.cpp
+++ b/engines/m4/riddle/rooms/section4/room405.cpp
@@ -79,7 +79,7 @@ void Room405::init() {
_bankNote = series_place_sprite("405 BANK NOTE UNDER RUG", 0, 0, 0, 100, 0xf00);
_candlesBurning = series_load("TWO CANDLES BURNING");
- _candles = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, 0,
+ _candles = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, false,
triggerMachineByHashCallback, "candles");
sendWSMessage_10000(1, _candles, _candlesBurning, 1, 8, -1,
_candlesBurning, 1, 8, 0);
@@ -108,7 +108,6 @@ void Room405::init() {
void Room405::daemon() {
int frame;
-
switch (_G(kernel).trigger) {
case 20:
digi_preload("405b01a");
@@ -140,7 +139,7 @@ void Room405::daemon() {
ws_hide_walker(_baron);
sendWSMessage_150000(-1);
ws_hide_walker(_G(my_walker));
- _baronWalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, 0,
+ _baronWalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, false,
triggerMachineByHashCallback, "BARON talks rip");
sendWSMessage_10000(1, _baronWalker, _baronShakeSit, 1, 48, 23,
_baronShakeSit, 48, 48, 0);
@@ -154,7 +153,7 @@ void Room405::daemon() {
break;
case 24:
- _ripTalksBaron = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, 0,
+ _ripTalksBaron = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, false,
triggerMachineByHashCallback, "rip talks baron");
_val5 = 1000;
_val6 = 1103;
@@ -225,7 +224,7 @@ void Room405::daemon() {
break;
case 36:
- _baronWalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, 0,
+ _baronWalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, false,
triggerMachineByHashCallback, "BARON talks rip");
sendWSMessage_10000(1, _baronWalker, _baronTalkLoop, 1, 1, 110,
_baronTalkLoop, 1, 1, 0);
@@ -599,9 +598,9 @@ void Room405::daemon() {
}
void Room405::pre_parser() {
- bool takeFlag = player_said("take");
- bool lookFlag = player_said_any("look", "look at");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool takeFlag = player_said("take");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (player_said("DOOR") && (lookFlag || useFlag || takeFlag)) {
_G(player).need_to_walk = false;
@@ -617,11 +616,11 @@ void Room405::pre_parser() {
}
void Room405::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool talkFlag = player_said_any("talk", "talk to");
- bool takeFlag = player_said("take");
- bool enterFlag = player_said("enter");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool talkFlag = player_said_any("talk", "talk to");
+ const bool takeFlag = player_said("take");
+ const bool enterFlag = player_said("enter");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (player_said("conv405a")) {
if (_G(kernel).trigger == 1)
@@ -721,9 +720,9 @@ void Room405::parser() {
}
void Room405::conv405a() {
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
_currentNode = conv_current_node();
- int entry = conv_current_entry();
+ const int entry = conv_current_entry();
const char *sound = conv_sound_to_play();
if (sound) {
@@ -814,7 +813,7 @@ void Room405::conv405a() {
}
void Room405::conv405a1() {
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (who <= 0)
_val8 = 2102;
diff --git a/engines/m4/riddle/walker.cpp b/engines/m4/riddle/walker.cpp
index af7a01947d2..ab25ae2f940 100644
--- a/engines/m4/riddle/walker.cpp
+++ b/engines/m4/riddle/walker.cpp
@@ -65,8 +65,8 @@ static const int16 SAFARI_SHADOWS_DIRS[6] = {
};
void Walker::player_walker_callback(frac16 myMessage, machine *sender) {
- int triggerType = _G(globals)[GLB_TEMP_1] >> 16;
- int subVal = _G(globals)[GLB_TEMP_2] >> 16;
+ const int triggerType = _G(globals)[GLB_TEMP_1] >> 16;
+ const int subVal = _G(globals)[GLB_TEMP_2] >> 16;
switch (triggerType) {
case 0:
@@ -112,9 +112,6 @@ bool Walker::walk_load_walker_and_shadow_series() {
}
machine *Walker::walk_initialize_walker() {
- machine *m;
- int32 s;
-
_G(player).walker_visible = true;
// Default walker
@@ -126,13 +123,13 @@ machine *Walker::walk_initialize_walker() {
_G(globals)[GLB_TEMP_3] = *RIPLEY_SHADOWS_DIRS << 24; // Starting series hash of default walker shadows
// initialize with bogus data (this is for the real walker)
- s = _G(globals)[GLB_MIN_SCALE] + FixedMul((400 << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
+ int32 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((400 << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
_G(globals)[GLB_TEMP_4] = 320 << 16;
_G(globals)[GLB_TEMP_5] = 400 << 16;
_G(globals)[GLB_TEMP_6] = s;
_G(globals)[GLB_TEMP_7] = 3 << 16; // facing
- m = TriggerMachineByHash(WALKER_HASH, nullptr, _G(player).walker_type + WALKER_HASH, 0, player_walker_callback, false, "PLAYER WALKER");
+ machine *m = TriggerMachineByHash(WALKER_HASH, nullptr, _G(player).walker_type + WALKER_HASH, 0, player_walker_callback, false, "PLAYER WALKER");
// We need to all init sequences to happen immediately (init coordinates)
cycleEngines(nullptr, &(_G(currentSceneDef).depth_table[0]),
More information about the Scummvm-git-logs
mailing list