[Scummvm-git-logs] scummvm master -> 5f555e430a100c9e7b40b1d57213c01dcb1f9bc6
Strangerke
noreply at scummvm.org
Wed Mar 5 21:36:44 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:
5f555e430a M4: RIDDLE: Cleanup and const in room 402
Commit: 5f555e430a100c9e7b40b1d57213c01dcb1f9bc6
https://github.com/scummvm/scummvm/commit/5f555e430a100c9e7b40b1d57213c01dcb1f9bc6
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-05T22:36:37+01:00
Commit Message:
M4: RIDDLE: Cleanup and const in room 402
Changed paths:
engines/m4/riddle/rooms/section4/room402.cpp
diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index 7b4470c6cf0..3235391c23a 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -106,7 +106,7 @@ void Room402::init() {
_wolfWantsMoney = series_load("WOLF WANTS MONEY");
_ripHeadTurn = series_load("RIP TREK HEAD TURN POS3");
- _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, 0,
+ _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, false,
triggerMachineByHashCallback, "WOLFIE");
sendWSMessage_10000(1, _wolfieMach, _wolfClipping, 1, 10, 110,
_wolfClipping, 10, 10, 0);
@@ -141,7 +141,7 @@ void Room402::init() {
digi_preload("950_s22");
_ripDownStairs = series_load("RIP DOWN STAIRS");
ws_hide_walker();
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, false,
triggerMachineByHashCallback, "rip leaving castle");
sendWSMessage_10000(1, _ripEnterLeave, _ripDownStairs, 1, 27, 55,
_ripDownStairs, 27, 27, 0);
@@ -172,7 +172,7 @@ void Room402::init() {
_wolfShakesHead = series_load("WOLF TALKS SHAKES HEAD");
_wolfWantsMoney = series_load("WOLF WANTS MONEY");
- _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, 0,
+ _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, false,
triggerMachineByHashCallback, "WOLFIE");
if (_val6) {
@@ -200,7 +200,7 @@ void Room402::init() {
_ripDownStairs = series_load("RIP DOWN STAIRS");
ws_hide_walker();
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, false,
triggerMachineByHashCallback, "rip leaving castle");
sendWSMessage_10000(1, _ripEnterLeave, _ripDownStairs, 1, 27, 55,
_ripDownStairs, 27, 27, 0);
@@ -218,7 +218,7 @@ void Room402::init() {
_turtlePopup = series_load("402 TURTLE POPUP");
_ripLeanWall = series_load("Rip leans against far wall");
- _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, 0,
+ _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, false,
triggerMachineByHashCallback, "WOLFIE");
_wolfMode = 2001;
_wolfShould = 2300;
@@ -258,7 +258,7 @@ void Room402::init() {
if (_G(flags)[V139]) {
_wolfClipping = series_load("WOLF CLIPPING LOOP");
- _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, 0,
+ _wolfieMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, false,
triggerMachineByHashCallback, "WOLFIE");
_wolfMode = 2001;
_wolfShould = 2300;
@@ -318,7 +318,7 @@ void Room402::daemon() {
case 27:
ws_hide_walker();
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "RIP talks to Wolife");
sendWSMessage_10000(1, _ripEnterLeave, _ripTalkWolf, 1, 13, 28,
_ripTalkWolf, 13, 13, 0);
@@ -425,10 +425,10 @@ void Room402::daemon() {
player_update_info();
_ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _ripEnterLeave, _ripTalker, 1, 1, -1,
@@ -502,7 +502,7 @@ void Room402::daemon() {
case 1120:
terminateMachineAndNull(_ripEnterLeave);
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
_val11 = 1122;
_letter = series_load("RIP SHOWS WOLF THE LETTER");
@@ -531,7 +531,7 @@ void Room402::daemon() {
player_update_info();
_ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
_val10 = 1000;
_val11 = 1103;
@@ -550,12 +550,12 @@ void Room402::daemon() {
case 1110:
player_update_info();
_ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
player_update_info();
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _safariShadow, _shadow3, 1, 1, -1,
_shadow3, 1, 1, 0);
@@ -777,12 +777,12 @@ void Room402::daemon() {
break;
case 2240:
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
player_update_info();
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _safariShadow, _shadow3, 1, 1, -1,
_shadow3, 1, 1, 0);
@@ -1022,12 +1022,12 @@ void Room402::daemon() {
break;
case 200:
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
player_update_info();
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _ripEnterLeave, _ripTalkWolf, 1, 7, -1,
_ripTalkWolf, 7, 7, 0);
@@ -1089,11 +1089,11 @@ void Room402::daemon() {
break;
case 210:
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
player_update_info();
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _safariShadow, _shadow3, 1, 1, -1,
@@ -1161,11 +1161,11 @@ void Room402::daemon() {
break;
case 221:
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip talks wolf");
player_update_info();
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _safariShadow, _shadow3, 1, 1, -1,
@@ -1214,11 +1214,11 @@ void Room402::daemon() {
break;
case 230:
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "trip talks wolf");
player_update_info();
_safariShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x200, false,
triggerMachineByHashCallback, "rip talks wolf SHADOW");
sendWSMessage_10000(1, _safariShadow, _shadow3, 1, 1, -1,
@@ -1293,12 +1293,12 @@ void Room402::daemon() {
case 350:
ws_hide_walker();
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip leans against wall");
sendWSMessage_10000(1, _ripEnterLeave, _ripLeanWall, 1, 23, 351,
_ripLeanWall, 23, 23, 0);
- _turtlePopupMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0, 0,
+ _turtlePopupMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0, false,
triggerMachineByHashCallback, "TURTLE POPUP");
_val14 = 0;
digi_preload("950_s27", 950);
@@ -1448,11 +1448,11 @@ void Room402::pre_parser() {
}
void Room402::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("conv402a")) {
if (_G(kernel).trigger == 777) {
@@ -1811,7 +1811,7 @@ void Room402::useTopiary() {
player_update_info();
_safariShadow = series_place_sprite("SAFARI SHADOW 3", 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale, 0xf00);
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x200, false,
triggerMachineByHashCallback, "rip entering castle");
sendWSMessage_10000(1, _ripEnterLeave, _ripMessesBush, 1, 10, 1,
_ripMessesBush, 10, 10, 0);
@@ -1851,7 +1851,7 @@ void Room402::enterCastle() {
_doorOpens = series_load("DOOR OPENS");
ws_hide_walker();
- _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, 0,
+ _ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, false,
triggerMachineByHashCallback, "rip entering castle");
sendWSMessage_10000(1, _ripEnterLeave, _ripClimbKnock, 1,
69, 1, _ripClimbKnock, 69, 69, 0);
@@ -1868,7 +1868,7 @@ void Room402::enterCastle() {
break;
case 3:
- _castleDoor = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, 0,
+ _castleDoor = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, false,
triggerMachineByHashCallback, "castle door");
sendWSMessage_10000(1, _castleDoor, _doorOpens, 1, 2, -1,
_doorOpens, 2, 2, 0);
More information about the Scummvm-git-logs
mailing list