[Scummvm-git-logs] scummvm master -> f35485c521dda9eaae35e4f5c571c04e016e2ee4
Strangerke
noreply at scummvm.org
Mon Mar 24 08:47:19 UTC 2025
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
351201fbfe M4: RIDDLE: Clean up in room 508
1be5eec7a0 M4: RIDDLE: Clean up in room 509
409a91e4bf M4: RIDDLE: Fix blocker when lifting the altar with the rope tight to it, room 510
f35485c521 M4: RIDDLE: Small Clean up in room 501
Commit: 351201fbfe60e8cdcbeea098382deeed0bfc83d9
https://github.com/scummvm/scummvm/commit/351201fbfe60e8cdcbeea098382deeed0bfc83d9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-24T09:46:55+01:00
Commit Message:
M4: RIDDLE: Clean up in room 508
Changed paths:
engines/m4/riddle/rooms/section5/room508.cpp
diff --git a/engines/m4/riddle/rooms/section5/room508.cpp b/engines/m4/riddle/rooms/section5/room508.cpp
index 5b1b5036069..08b5dc008d5 100644
--- a/engines/m4/riddle/rooms/section5/room508.cpp
+++ b/engines/m4/riddle/rooms/section5/room508.cpp
@@ -112,7 +112,7 @@ void Room508::daemon() {
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100,
- _G(player_info).depth, 0, triggerMachineByHashCallback, "Rp1");
+ _G(player_info).depth, false, triggerMachineByHashCallback, "Rp1");
sendWSMessage_10000(1, _ripley, _ripPutsShovel, 1, 22, 505,
_ripPutsShovel, 22, 22, 0);
inv_move_object("SHOVEL", 508);
@@ -146,7 +146,7 @@ void Room508::daemon() {
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100,
- _G(player_info).depth, 0, triggerMachineByHashCallback, "Rp2");
+ _G(player_info).depth, false, triggerMachineByHashCallback, "Rp2");
sendWSMessage_10000(1, _ripley, _ripPutsShovel, 34, 25, 509,
_ripPutsShovel, 25, 25, 0);
hotspot_set_active("SHOVEL", false);
@@ -175,7 +175,7 @@ void Room508::daemon() {
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100,
- _G(player_info).depth, 0, triggerMachineByHashCallback, "Rp3");
+ _G(player_info).depth, false, triggerMachineByHashCallback, "Rp3");
terminateMachineAndNull(_shovel);
sendWSMessage_10000(1, _ripley, _ripTryTurnDome, 1, 29, 512,
_ripTryTurnDome, 29, 29, 0);
@@ -217,7 +217,7 @@ void Room508::daemon() {
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100,
- _G(player_info).depth, 0, triggerMachineByHashCallback, "Rp4");
+ _G(player_info).depth, false, triggerMachineByHashCallback, "Rp4");
sendWSMessage_10000(1, _ripley, _ripTryTurnDome, 1, 29, 516,
_ripTryTurnDome, 29, 29, 0);
break;
@@ -268,18 +268,18 @@ void Room508::daemon() {
_shovel = series_place_sprite("SHOVEL AFTER DOMES TURNED", 0, 0, 0, 100, 0x300);
_statue = series_place_sprite("STATU SPRITE AFTER DOME TURN", 0, 0, 0, 100, 0x450);
- _light = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, 0,
+ _light = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, false,
triggerMachineByHashCallback, "Receeding Light");
sendWSMessage_10000(1, _light, _lightAppearing, 12, 12, -1,
_lightAppearing, 12, 12, 0);
player_update_info();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100,
- _G(player_info).depth, 0, triggerMachineByHashCallback, "Rp");
+ _G(player_info).depth, false, triggerMachineByHashCallback, "Rp");
sendWSMessage_10000(1, _ripley, _ripReturnsToStander, 1, 10, -1,
_ripReturnsToStander, 10, 10, 0);
- _chain = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, 0,
+ _chain = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, false,
triggerMachineByHashCallback, "Chain Breaking Machine");
sendWSMessage_10000(1, _chain, _chainBreaking, 1, 58, 675,
_chainBreaking, 58, 58, 0);
@@ -293,7 +293,7 @@ void Room508::daemon() {
break;
case 539:
- _x = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, 0,
+ _x = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, false,
triggerMachineByHashCallback, "x");
sendWSMessage_10000(1, _x, _flick, 1, 2, -1, _flick, 1, 2, 0);
sendWSMessage_190000(_x, 1);
@@ -441,9 +441,9 @@ void Room508::pre_parser() {
}
void Room508::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool takeFlag = player_said("take");
- bool useFlag = player_said("gear");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said("gear");
if (lookFlag && player_said(" ")) {
if (_G(flags)[V162] == 1) {
Commit: 1be5eec7a08cb0994d5e2c8d4f97003c4f037c91
https://github.com/scummvm/scummvm/commit/1be5eec7a08cb0994d5e2c8d4f97003c4f037c91
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-24T09:46:56+01:00
Commit Message:
M4: RIDDLE: Clean up in room 509
Changed paths:
engines/m4/riddle/rooms/section5/room509.cpp
diff --git a/engines/m4/riddle/rooms/section5/room509.cpp b/engines/m4/riddle/rooms/section5/room509.cpp
index 21e8328635b..f8bca1b737e 100644
--- a/engines/m4/riddle/rooms/section5/room509.cpp
+++ b/engines/m4/riddle/rooms/section5/room509.cpp
@@ -65,7 +65,7 @@ void Room509::daemon() {
case 2:
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "Rip climbs steps from 506");
sendWSMessage_10000(1, _ripley, _ripFrom506, 1, 39, 6,
_ripFrom506, 40, 40, 0);
@@ -73,7 +73,7 @@ void Room509::daemon() {
case 3:
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "Rip climbs steps from 506");
sendWSMessage_10000(1, _ripley, _ripFrom510, 1, 15, 7,
_ripFrom510, 16, 16, 0);
@@ -129,9 +129,9 @@ void Room509::pre_parser() {
}
void Room509::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool takeFlag = player_said("take");
- bool useFlag = player_said("gear");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said("gear");
if (lookFlag && player_said("wall")) {
digi_play("509R03", 1);
@@ -183,7 +183,7 @@ void Room509::parser() {
player_set_commands_allowed(false);
ws_hide_walker();
digi_preload("509_s02");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "RIP DIGS AT WALL");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _ripley, _ripDigsWall, 1, 33, 8,
@@ -198,7 +198,7 @@ void Room509::parser() {
player_set_commands_allowed(false);
ws_hide_walker();
_roomNum = 510;
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "RIP CLIMBS UP TO 510");
sendWSMessage_10000(1, _ripley, _ripClimbStairs3, 1, 8, 1,
_ripClimbStairs3, 9, 16, 0);
@@ -218,7 +218,7 @@ void Room509::parser() {
player_set_commands_allowed(false);
ws_hide_walker();
_roomNum = 506;
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "RIP CLIMBS DOWN TO 506");
sendWSMessage_10000(1, _ripley, _ripClimbStairs1, 1, 14, 1,
_ripClimbStairs1, 15, 28, 0);
Commit: 409a91e4bf48d066fb848e34b29985812edcd6ac
https://github.com/scummvm/scummvm/commit/409a91e4bf48d066fb848e34b29985812edcd6ac
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-24T09:46:56+01:00
Commit Message:
M4: RIDDLE: Fix blocker when lifting the altar with the rope tight to it, room 510
Changed paths:
engines/m4/riddle/rooms/section5/room510.cpp
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 0ed5cd6a375..771680a7c8e 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -970,7 +970,7 @@ bool Room510::useAltarPost() {
if (_G(flags)[V169] <= 0) {
terminateMachineAndNull(_statue);
_statue = series_play("510 RIP LOWERS STATUE", 0xa00, 16, 1, 5);
- } else if (_G(flags)[V169] == 1) {
+ } else if (_G(flags)[V169] <= 2) {
terminateMachineAndNull(_statue);
_statue = series_play("510 RIP LOWERS STATUE", 0xa00, 18, 1, 5);
}
Commit: f35485c521dda9eaae35e4f5c571c04e016e2ee4
https://github.com/scummvm/scummvm/commit/f35485c521dda9eaae35e4f5c571c04e016e2ee4
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-24T09:46:56+01:00
Commit Message:
M4: RIDDLE: Small Clean up in room 501
Changed paths:
engines/m4/riddle/rooms/section5/room501.cpp
diff --git a/engines/m4/riddle/rooms/section5/room501.cpp b/engines/m4/riddle/rooms/section5/room501.cpp
index e899750ea24..2dd4d617ca8 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -43,7 +43,7 @@ void Room501::init() {
digi_play_loop("501_s01", 3, 30);
if (_G(game).previous_room != KERNEL_RESTORING_GAME) {
_val2 = 0;
- _digiName = 0;
+ _digiName = nullptr;
_val4 = 0;
}
@@ -348,7 +348,7 @@ void Room501::daemon() {
_xyzzy6 = -1;
_xyzzy7 = -1;
_xyzzy5 = -1;
- _agent = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, 0,
+ _agent = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, false,
triggerMachineByHashCallback, "Agent at Desk");
sendWSMessage_10000(1, _agent, _agentStridesForward, 15, 15, 506,
_agentStridesForward, 15, 15, 0);
@@ -748,7 +748,7 @@ void Room501::daemon() {
case 543: {
series_unload(_ripParcelExchange);
- int item = conv_current_entry();
+ const int item = conv_current_entry();
if (item >= 0 && item <= 11) {
static const char *ITEMS[12] = {
"CRYSTAL SKULL", "STICK AND SHELL MAP",
More information about the Scummvm-git-logs
mailing list