[Scummvm-git-logs] scummvm master -> 2dc1079c7dfbbf83934ca6673a1a83cc1d4bd9bd
Strangerke
noreply at scummvm.org
Wed Dec 25 23:49:31 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:
2dc1079c7d M4: RIDDLE: Rooms section 2: fix the use of TriggerMachineByHash, some renaming in room 204
Commit: 2dc1079c7dfbbf83934ca6673a1a83cc1d4bd9bd
https://github.com/scummvm/scummvm/commit/2dc1079c7dfbbf83934ca6673a1a83cc1d4bd9bd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-26T00:49:24+01:00
Commit Message:
M4: RIDDLE: Rooms section 2: fix the use of TriggerMachineByHash, some renaming in room 204
Changed paths:
engines/m4/riddle/rooms/section2/room201.cpp
engines/m4/riddle/rooms/section2/room203.cpp
engines/m4/riddle/rooms/section2/room204.cpp
engines/m4/riddle/rooms/section2/room204.h
engines/m4/riddle/rooms/section2/room205.cpp
engines/m4/riddle/rooms/section2/room207.cpp
diff --git a/engines/m4/riddle/rooms/section2/room201.cpp b/engines/m4/riddle/rooms/section2/room201.cpp
index 8db8d293ec2..bbbbbd5848c 100644
--- a/engines/m4/riddle/rooms/section2/room201.cpp
+++ b/engines/m4/riddle/rooms/section2/room201.cpp
@@ -104,11 +104,11 @@ void Room201::init() {
digi_play_loop("950_s02", 3, 50);
if (_flag1) {
- _mei1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, 0,
+ _mei1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false,
triggerMachineByHashCallback, "mc");
sendWSMessage(1, _mei1, _series4, 1, 1, -1, _series4, 1, 1, 0);
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false,
triggerMachineByHashCallback, "rip");
sendWSMessage(1, _ripley, _series2, 1, 21, -1, _series2, 21, 21, 0);
kernel_timing_trigger(10, 100);
@@ -122,7 +122,7 @@ void Room201::init() {
_meiHandHip = series_load("MEI TREK HAND ON HIP POS4");
_meiTalker = series_load("MEI TREK TALKER POS4");
_meiWalk = series_load("MEI CHEN TREK WALK POS4");
- _mei2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 200, 238, 73, 0x900, 0,
+ _mei2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 200, 238, 73, 0x900, false,
triggerMachineByHashCallback, "MC");
series_place_sprite("candleman shadow4", 0, 200, 238, 73, 0xf00);
sendWSMessage(1, _mei2, _meiHandHip, 22, 22, 2000, _meiHandHip, 22, 22, 0);
@@ -481,7 +481,7 @@ void Room201::daemon() {
break;
case 507:
- _agent = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _agent = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "201 guy behind desk 1");
_agentMode = 9;
_agentShould = 8;
@@ -491,7 +491,7 @@ void Room201::daemon() {
break;
case 509:
- _agent = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _agent = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "201 guy behind desk 2");
sendWSMessage_10000(1, _agent, _nod, 1, 1, 510, _nod, 1, 1, 0);
_agentMode = 0;
@@ -692,7 +692,7 @@ void Room201::daemon() {
ws_get_walker_info(_mei0, &_G(player_info).x, &_G(player_info).y,
&_G(player_info).scale, &_G(player_info).depth, &_G(player_info).facing);
_mei2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y,
- _G(player_info).scale, 0x900, 0, triggerMachineByHashCallback, "Mei Chen other states machine");
+ _G(player_info).scale, 0x900, false, triggerMachineByHashCallback, "Mei Chen other states machine");
series_place_sprite("candleman shadow4", 0, _G(player_info).x, _G(player_info).y,
_G(player_info).scale, 0xf00);
sendWSMessage_10000(1, _mei2, _meiWalk, 1, 1, 2000, _meiWalk, 1, 1, 0);
@@ -1773,7 +1773,7 @@ void Room201::animateRipley() {
player_update_info();
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100,
- _G(player_info).depth, 0, triggerMachineByHashCallback,
+ _G(player_info).depth, false, triggerMachineByHashCallback,
"Rip Delta Machine State");
sendWSMessage_10000(1, _ripley, _series7, 1, 1, 4010, _series7, 1, 1, 0);
_shadow3 = series_place_sprite("SAFARI SHADOW 3", 0,
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index bce79686f72..193549addbe 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -85,9 +85,9 @@ void Room203::init() {
_peasantSeries = series_load("pesky peasant reach for helmet");
_peasantSeriesShadow = series_load("shadow pp reach for helmet");
- _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1240, 332, 75, 0x800, 0,
+ _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1240, 332, 75, 0x800, false,
triggerMachineByHashCallback, "pesky peasant");
- _peasantShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1240, 332, 75, 0x800, 0,
+ _peasantShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1240, 332, 75, 0x800, false,
triggerMachineByHashCallback, "pesky peasant SHADOW");
sendWSMessage_10000(1, _peasant, _peasantSeries, 23, 36, 121,
_peasantSeries, 36, 23, 2);
@@ -203,10 +203,10 @@ void Room203::init() {
_peasantLayer = 0x800;
_peasantScale = 75;
- _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1100, 322, 75, 0x800, 0,
+ _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1100, 322, 75, 0x800, false,
triggerMachineByHashCallback, "pp");
_peasantShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _peasantX, _peasantY - 53, _peasantScale, _peasantLayer, 0,
+ _peasantX, _peasantY - 53, _peasantScale, _peasantLayer, false,
triggerMachineByHashCallback, "pp");
sendWSMessage_10000(1, _peasant, _peskyYellsThief, 21, 17, 354,
@@ -220,7 +220,7 @@ void Room203::init() {
_officialShould = 2010;
_officialStander = series_load("official stander");
- _official = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1436, 362, 85, 0xf00, 0,
+ _official = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1436, 362, 85, 0xf00, false,
triggerMachineByHashCallback, "of");
sendWSMessage_10000(1, _official, _officialStander, 1, 1, 356,
_officialStander, 1, 1, 0);
@@ -523,7 +523,7 @@ void Room203::daemon() {
_ripPointsAtHelmet = series_load("rip points at helmet");
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip kneel");
sendWSMessage_10000(1, _ripley, _ripKneeling, 1, 31, 42, _ripKneeling, 31, 31, 0);
break;
@@ -587,7 +587,7 @@ void Room203::daemon() {
_oldLadyNoHelmet = series_load("old lady feeding no helmet");
ws_hide_walker();
_ripKneeling = series_load("rip kneels down to old lady");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip kneel");
sendWSMessage_10000(1, _ripley, _ripKneeling, 1, 31, 62, _ripKneeling, 31, 31, 0);
break;
@@ -619,7 +619,7 @@ void Room203::daemon() {
break;
case 69:
- _stream1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _stream1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "POPUP OL & lover");
_oldLadyPhotoPopup = series_load("old woman photo pop-up");
sendWSMessage_10000(1, _stream1, _oldLadyPhotoPopup, 1, 5, -1,
@@ -684,11 +684,11 @@ void Room203::daemon() {
break;
case 79:
- _oldLady = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _oldLady = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _oldLady, _oldLadyNoHelmet, 1, 1, -1,
_oldLadyNoHelmet, 1, 1, 0);
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip kneel");
sendWSMessage_10000(1, _ripley, _ripKneelingTalk, 1, 1, -1,
_ripKneelingTalk, 1, 1, 0);
@@ -710,7 +710,7 @@ void Room203::daemon() {
case 82:
terminateMachineAndNull(_ripley);
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip kneel");
_ripKneeling = series_load("rip kneels down to old lady");
sendWSMessage_10000(1, _ripley, _ripKneeling, 31, 1, 84, _ripKneeling, 1, 1, 0);
@@ -741,7 +741,7 @@ void Room203::daemon() {
_peasantRocksShadow = series_load("shadow pesky rock loop");
_ripClimbsAndBacksDown = series_load("rip climbs and backs down");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip climbs");
sendWSMessage_10000(1, _ripley, _ripClimbsAndBacksDown, 1, 75, 96,
_ripClimbsAndBacksDown, 75, 75, 0);
@@ -751,9 +751,9 @@ void Room203::daemon() {
case 91:
terminateMachineAndNull(_peasant);
terminateMachineAndNull(_peasantShadow);
- _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 745, 325, 75, 0x800, 0,
+ _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 745, 325, 75, 0x800, false,
triggerMachineByHashCallback, "pesky peasant yells thief");
- _peasantShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 745, 325, 75, 0x800, 0,
+ _peasantShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 745, 325, 75, 0x800, false,
triggerMachineByHashCallback, "SHADOW pp yells thief");
sendWSMessage_10000(1, _peasant, _peskyYellsThief, 1, 19, 94,
_peskyYellsThief, 19, 19, 0);
@@ -1828,10 +1828,10 @@ void Room203::daemon() {
player_update_info();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale,
- 0x100, 0, triggerMachineByHashCallback, "rip talks official");
+ 0x100, false, triggerMachineByHashCallback, "rip talks official");
_ripsh1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale,
- 0x100, 0, triggerMachineByHashCallback, "rip talks official SHADOW");
+ 0x100, false, triggerMachineByHashCallback, "rip talks official SHADOW");
sendWSMessage_10000(1, _ripley, _ripHandTalk, 1, 16, -1, _ripHandTalk, 1, 1, 0);
sendWSMessage_10000(1, _ripsh1, _shadow3, 1, 1, -1, _shadow3, 1, 1, 0);
@@ -2052,7 +2052,7 @@ void Room203::daemon() {
_ripKneeling = series_load("rip kneels down to old lady");
_ripKneelingTalk = series_load("rip kneeling talks to old lady");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x400, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x400, false,
triggerMachineByHashCallback, "rip in conv");
sendWSMessage_10000(1, _ripley, _ripKneeling, 1, 31, 150, _ripKneeling, 31, 31, 0);
_ripleyShould = 1112;
@@ -2178,10 +2178,10 @@ void Room203::daemon() {
player_update_info();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale,
- 0x100, 0, triggerMachineByHashCallback, "rip talks official");
+ 0x100, false, triggerMachineByHashCallback, "rip talks official");
_ripsh1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale,
- 0x100, 0, triggerMachineByHashCallback, "rip talks official SHADOW");
+ 0x100, false, triggerMachineByHashCallback, "rip talks official SHADOW");
sendWSMessage_10000(1, _ripley, _ripTalker, 1, 1, -1, _ripTalker, 1, 1, 0);
sendWSMessage_10000(1, _ripsh1, _shadow3, 1, 1, 150, _shadow3, 1, 1, 0);
_ripleyShould = 1211;
@@ -2454,10 +2454,10 @@ void Room203::daemon() {
_peasantLayer = 0x800;
_peasantScale = 75;
- _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 745, 325, 75, 0x800, 0,
+ _peasant = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 745, 325, 75, 0x800, false,
triggerMachineByHashCallback, "pesky peasant");
_peasantShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _peasantX, _peasantY - 53, _peasantScale, _peasantLayer, 0,
+ _peasantX, _peasantY - 53, _peasantScale, _peasantLayer, false,
triggerMachineByHashCallback, "pesky peasant shadow");
sendWSMessage_10000(1, _peasantShadow, _peasantRocksShadow, 1, 1, -1,
_peasantRocksShadow, 1, 1, 0);
@@ -2500,7 +2500,7 @@ void Room203::daemon() {
case 9005:
sendWSMessage_10000(_g1, -30, 350, 9, -1, 1);
- _sg = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x500, 0,
+ _sg = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x500, false,
triggerMachineByHashCallback, "sg");
sendWSMessage_10000(1, _sg, _203sg01, 1, 1, -1, _203sg01, 1, 1, 0);
setGlobals1(_ripHeadTurn, 6, 9, 9, 9);
@@ -2795,7 +2795,7 @@ void Room203::parser() {
_ripHandsBehBack = series_load("rip trek hands beh back pos1");
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
- _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x400, 0,
+ _G(player_info).x, _G(player_info).y, _G(player_info).scale, 0x400, false,
triggerMachineByHashCallback, "rip in conv");
_ripleyMode = 1001;
_ripleyShould = 1010;
@@ -3032,7 +3032,7 @@ void Room203::parser() {
hotspot_set_active("SOLDIER'S HELMET ", true);
series_load("one frame helmet");
_ripTossesHelmet = series_load("rip tosses helmet");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 960, -53, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 960, -53, 100, 0x100, false,
triggerMachineByHashCallback, "rip throws helmet");
sendWSMessage_10000(1, _ripley, _ripTossesHelmet, 1, 33, 2, _ripTossesHelmet, 33, 33, 0);
break;
@@ -3215,7 +3215,7 @@ void Room203::setupPeasantHotspot(int mode) {
void Room203::setupGk() {
_gkFrame = series_load("gk single frame");
- _gk = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x800, 0,
+ _gk = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x800, false,
triggerMachineByHashCallback, "gk single frame");
_gkMode = _gkShould = 3000;
sendWSMessage_10000(1, _gk, _gkFrame, 1, 1, -1, _gkFrame, 1, 1, 0);
@@ -3230,14 +3230,14 @@ void Room203::setupOldLady() {
_oldLadyNoHelmet = series_load("old lady feeding no helmet");
_oldLadyMode = 5569;
_oldLadyShould = 5200;
- _oldLady = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _oldLady = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _oldLady, _oldLadyNoHelmet, 1, 1, -1,
_oldLadyNoHelmet, 1, 1, 0);
} else {
_oldLadyFeedingBirds = series_load("old lady feeding birds");
- _oldLady = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, 0,
+ _oldLady = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 640, -53, 100, 0x100, false,
triggerMachineByHashCallback, "ol");
_oldLadyMode = 5666;
_oldLadyShould = 5100;
@@ -3249,9 +3249,9 @@ void Room203::setupOldLady() {
void Room203::setupPigeons() {
_pigeonsSeries1 = series_load("pigeon series of flcs 1");
_pigeonsSeries3 = series_load("pigeon series of flcs 3");
- _pigeons1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1045, 373, 85, 0, 0,
+ _pigeons1 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1045, 373, 85, 0, false,
triggerMachineByHashCallback, "pig1");
- _pigeons3 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1065, 370, 85, 1, 0,
+ _pigeons3 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1065, 370, 85, 1, false,
triggerMachineByHashCallback, "pig3");
kernel_trigger_dispatchx(kernel_trigger_create(392));
@@ -3261,9 +3261,9 @@ void Room203::setupOfficial() {
_officialMode = 2001;
_officialShould = 2010;
_officialStander = series_load("official stander");
- _official = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1436, 362, 85, 0xf00, 0,
+ _official = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1436, 362, 85, 0xf00, false,
triggerMachineByHashCallback, "of");
- _officialShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1436, 362, 85, 0xf00, 0,
+ _officialShadow = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 1436, 362, 85, 0xf00, false,
triggerMachineByHashCallback, "ofSH");
sendWSMessage_10000(1, _official, _officialStander, 1, 1, -1,
_officialStander, 1, 1, 0);
diff --git a/engines/m4/riddle/rooms/section2/room204.cpp b/engines/m4/riddle/rooms/section2/room204.cpp
index 28f58d4396f..9181bd22c27 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -66,7 +66,7 @@ void Room204::init() {
_courtyardGongSeries = series_load("COURTYARD GONG", -1, nullptr);
_malletSpriteSeries = series_load("MALLET SPRITE", -1, nullptr);
- _field68 = 0;
+ _ripMachineFlag = 0;
_field44_triggerNum = -1;
_field48_triggerNum = -1;
_fieldC4 = -1;
@@ -103,9 +103,9 @@ void Room204::init() {
if (_field4 == 1) {
initWalkerSeries();
- _mcMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, _fieldE0, 323, (_fieldDC == 1) ? 10 : 2, Walker::player_walker_callback, "mc walker room 204");
+ _mcMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, _fieldE0_x, 323, _meiMachineFlag ? 10 : 2, Walker::player_walker_callback, "mc walker room 204");
addMovingMeiHotspot();
- if (_fieldE0 == 472) {
+ if (_fieldE0_x == 472) {
deleteMalletHotspot();
addLookMalletHotspot();
}
@@ -131,7 +131,7 @@ void Room204::init() {
sendWSMessage_10000(_mcMach, 450, 340, 9, -1, true);
kernel_timing_trigger(60, 5, nullptr);
} else {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_field40 = 0;
player_set_commands_allowed(false);
if (!_G(flags)[V070]) {
@@ -265,7 +265,7 @@ void Room204::parser() {
if (lookFl && player_said("SHIH CHI TABLETS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x > 1500) {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_fieldE4_walkerDestX = 1663;
moveAndLookFl = true;
}
@@ -274,7 +274,7 @@ void Room204::parser() {
if (lookFl && player_said("SHIH CHING TABLETS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x > 1400) {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_fieldE4_walkerDestX = 1494;
moveAndLookFl = true;
}
@@ -283,7 +283,7 @@ void Room204::parser() {
if (lookFl && player_said("CONFUCIAN ANALECTS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x > 1280) {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_fieldE4_walkerDestX = 1412;
moveAndLookFl = true;
}
@@ -343,7 +343,7 @@ void Room204::parser() {
series_unload(_meiTalksPos3Series);
DisposePath(_mcMach->walkPath);
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 555;
_mcMach->walkPath = CreateCustomPath(463, 359, 555, 323, -1);
@@ -355,7 +355,7 @@ void Room204::parser() {
_field108 = 0;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 630, nullptr);
- _fieldE0 = 555;
+ _fieldE0_x = 555;
deleteMeiCheiHotspot();
addMovingMeiHotspot();
@@ -370,7 +370,7 @@ void Room204::parser() {
} // if (lookFl && player_said("CONFUCIAN ANALECTS "))
if (lookFl && player_said("TAO-TE CHING TABLETS")) {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_fieldE4_walkerDestX = 1328;
moveAndLookFl = true;
}
@@ -378,7 +378,7 @@ void Room204::parser() {
if (lookFl && player_said("SHIH CHI TABLETS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x >= 1300) {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_fieldE4_walkerDestX = 1245;
moveAndLookFl = true;
}
@@ -387,7 +387,7 @@ void Room204::parser() {
if (lookFl && player_said("LAO-TZU TABLETS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x > 700) {
- _fieldDC = 0;
+ _meiMachineFlag = false;
_fieldE4_walkerDestX = 800;
moveAndLookFl = true;
}
@@ -396,14 +396,14 @@ void Room204::parser() {
if (lookFl && player_said("SHANG TABLETS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x < 900) {
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 717;
moveAndLookFl = true;
}
}
if (lookFl && player_said("TABLETS OF HISTORY")) {
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 670;
moveAndLookFl = true;
}
@@ -411,7 +411,7 @@ void Room204::parser() {
if (lookFl && player_said("CONFUCIAN ANALECTS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x < 1280) {
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 555;
moveAndLookFl = true;
}
@@ -420,7 +420,7 @@ void Room204::parser() {
if (lookFl && player_said("LAO-TZU TABLETS")) {
player_update_info(_G(my_walker), &_G(player_info));
if (_G(player_info).x < 640) {
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 472;
moveAndLookFl = true;
}
@@ -441,10 +441,10 @@ void Room204::parser() {
case 1:
DisposePath(_mcMach->walkPath);
_mcMach->walkPath = CreateCustomPath(_fieldE4_walkerDestX, 323, -1);
- _fieldE0 = 0;
+ _fieldE0_x = 0;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_custom_walk(_mcMach, (_fieldDC == 1) ? 10 : 2, 632, true);
+ ws_custom_walk(_mcMach, _meiMachineFlag ? 10 : 2, 632, true);
_G(kernel).trigger_mode = KT_PARSE;
kernel_timing_trigger(5, 2, nullptr);
@@ -452,7 +452,7 @@ void Room204::parser() {
break;
case 2:
- if (_fieldE0 == _fieldE4_walkerDestX)
+ if (_fieldE0_x == _fieldE4_walkerDestX)
kernel_timing_trigger(30, 5, nullptr);
else
kernel_timing_trigger(1, 2, nullptr);
@@ -906,7 +906,7 @@ void Room204::parser() {
player_set_commands_allowed(false);
ws_get_walker_info(_mcMach, &_G(player_info).x, &_G(player_info).y, &_G(player_info).scale, &_G(player_info).depth, &_G(player_info).facing);
- _fieldF8 = (_fieldDC == 1) ? 10 : 2;
+ _fieldF8 = _meiMachineFlag ? 10 : 2;
DisposePath(_mcMach->walkPath);
_mcMach->walkPath = CreateCustomPath(_G(player_info).x + 1, _G(player_info).y, -1);
ws_custom_walk(_mcMach, 4, 3, true);
@@ -1072,7 +1072,7 @@ void Room204::daemon() {
break;
case 501:
- _ripDeltaMachineStateMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, _G(player_info).depth, 0, triggerMachineByHashCallback, "Rip Delta Machine State");
+ _ripDeltaMachineStateMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, _G(player_info).depth, false, triggerMachineByHashCallback, "Rip Delta Machine State");
sendWSMessage_10000(1, _ripDeltaMachineStateMach, _ripDropsSeries, 1, 2, 502, _ripDropsSeries, 2, 2, 0);
break;
@@ -1152,7 +1152,7 @@ void Room204::daemon() {
case 517:
series_unload(_ripTrekLHandTalkPos4Series);
_fieldD4 = 3;
- _fieldDC = 1;
+ _meiMachineFlag = true;
_field108 = 1;
kernel_timing_trigger(1, 574, nullptr);
kernel_timing_trigger(2, 518, nullptr);
@@ -1406,7 +1406,7 @@ void Room204::daemon() {
_field2C = 0;
player_update_info(_G(my_walker), &_G(player_info));
ws_hide_walker(_G(my_walker));
- _ripDeltaMachineStateMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, _G(player_info).depth, _field68, triggerMachineByHashCallback, "Rip Absolute Machine State");
+ _ripDeltaMachineStateMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, _G(player_info).depth, _ripMachineFlag, triggerMachineByHashCallback, "Rip Absolute Machine State");
switch (_field10) {
case 8:
sendWSMessage_10000(1, _ripDeltaMachineStateMach, _ripBangsBongSeries, 1, 1, 571, _ripBangsBongSeries, 1, 1, 0);
@@ -1443,7 +1443,7 @@ void Room204::daemon() {
player_update_info(_G(my_walker), &_G(player_info));
ws_hide_walker(_G(my_walker));
- _ripDeltaMachineStateMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, _G(player_info).depth, 0, triggerMachineByHashCallback, "Rip Delta Machine State");
+ _ripDeltaMachineStateMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, _G(player_info).depth, false, triggerMachineByHashCallback, "Rip Delta Machine State");
if (_field10 == 8) {
sendWSMessage_10000(1, _ripDeltaMachineStateMach, _ripBangsBongSeries, 1, 1, 571, _ripBangsBongSeries, 1, 1, 0);
@@ -1502,7 +1502,7 @@ void Room204::daemon() {
_ripDeltaMachineStateMach = nullptr;
ws_unhide_walker(_G(my_walker));
terminateMachine(_safariShadow3Mach);
- _field68 = 0;
+ _ripMachineFlag = false;
if (_field14 == 16)
series_unload(_ripTrekTalkerPos3Series);
@@ -1747,7 +1747,7 @@ void Room204::daemon() {
if (_field110_y == 323)
_field11C_depth = 3840;
- _meiChenOtherStatesMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _field10C_x, _field110_y, _field118_scale, _field11C_depth, _fieldDC, triggerMachineByHashCallback, "Mei Chen other states machine");
+ _meiChenOtherStatesMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _field10C_x, _field110_y, _field118_scale, _field11C_depth, _meiMachineFlag, triggerMachineByHashCallback, "Mei Chen other states machine");
_safariShadow2Mach = series_place_sprite("SAFARI SHADOW 2", 0, _field10C_x, _field110_y, _field118_scale, 3840);
switch (_fieldD4) {
@@ -1819,15 +1819,15 @@ void Room204::daemon() {
} else {
switch (_fieldD0) {
case 3:
- _field114_facing = (_fieldDC == 1) ? 10 : 2;
+ _field114_facing = _meiMachineFlag ? 10 : 2;
break;
case 4:
- _field114_facing = (_fieldDC == 1) ? 9 : 3;
+ _field114_facing = _meiMachineFlag ? 9 : 3;
break;
case 5:
- _field114_facing = (_fieldDC == 1) ? 8 : 4;
+ _field114_facing = _meiMachineFlag ? 8 : 4;
break;
default:
@@ -1845,8 +1845,8 @@ void Room204::daemon() {
}
terminateMachine(_meiChenOtherStatesMach);
- _meiChenOtherStatesMach = 0;
- _fieldDC = 0;
+ _meiChenOtherStatesMach = nullptr;
+ _meiMachineFlag = false;
terminateMachine(_safariShadow2Mach);
switch (_fieldD0) {
@@ -1903,7 +1903,7 @@ void Room204::daemon() {
break;
case 17: {
- int32 rnd = imath_ranged_rand(1, 4);
+ const int32 rnd = imath_ranged_rand(1, 4);
sendWSMessage_10000(1, _meiChenOtherStatesMach, _meiTalksPos3Series, rnd, rnd, 576, _meiTalksPos3Series, rnd, rnd, 0);
}
@@ -1922,7 +1922,7 @@ void Room204::daemon() {
break;
case 13: {
- int32 rnd = imath_ranged_rand(1, 4);
+ const int32 rnd = imath_ranged_rand(1, 4);
sendWSMessage_10000(1, _meiChenOtherStatesMach, _meiTrekTalkerPos4Series, rnd, rnd, 576, _meiTrekTalkerPos4Series, rnd, rnd, 0);
} break;
@@ -1983,7 +1983,7 @@ void Room204::daemon() {
_field12C_triggerNum = -1;
_field130 = 0;
- _acolyteGuardingEntranceMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 2048, 0, triggerMachineByHashCallback, "Acolyte Guarding Entrance");
+ _acolyteGuardingEntranceMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 2048, false, triggerMachineByHashCallback, "Acolyte Guarding Entrance");
_acolyteSaysHaltSeries = series_load("ACOLYTE SAYS HALT", -1, nullptr);
sendWSMessage_10000(1, _acolyteGuardingEntranceMach, _acolyteSaysHaltSeries, 1, 1, 579, _acolyteSaysHaltSeries, 1, 1, 0);
@@ -2095,7 +2095,7 @@ void Room204::daemon() {
break;
case 581:
- if (_fieldE0 != _fieldE4_walkerDestX) {
+ if (_fieldE0_x != _fieldE4_walkerDestX) {
_fieldD4 = 3;
_fieldBC_trigger = kernel_trigger_create(582);
}
@@ -2118,7 +2118,7 @@ void Room204::daemon() {
break;
case 584:
- _fieldE0 = _fieldE4_walkerDestX;
+ _fieldE0_x = _fieldE4_walkerDestX;
kernel_timing_trigger(1, 578);
player_set_commands_allowed(true);
@@ -2166,7 +2166,7 @@ void Room204::daemon() {
case 596:
_field134 = 1;
_field10 = 16;
- _field68 = 1;
+ _ripMachineFlag = true;
_field18_triggerNum = kernel_trigger_create(597);
_G(kernel).trigger_mode = KT_DAEMON;
@@ -2398,7 +2398,7 @@ void Room204::daemon() {
DisposePath(_mcMach->walkPath);
_mcMach->walkPath = CreateCustomPath(_fieldE4_walkerDestX, 323, -1);
- ws_custom_walk(_mcMach, (_fieldDC == 1) ? 10 : 2, 631, true);
+ ws_custom_walk(_mcMach, _meiMachineFlag ? 10 : 2, 631, true);
} else if ((_G(game_buff_ptr)->x1 * -1) + 639 <= _G(player_info).x) {
hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN", false);
@@ -2412,7 +2412,7 @@ void Room204::daemon() {
DisposePath(_mcMach->walkPath);
_mcMach->walkPath = CreateCustomPath(_fieldE4_walkerDestX, 323, -1);
- ws_custom_walk(_mcMach, (_fieldDC == 1) ? 10 : 2, 631, true);
+ ws_custom_walk(_mcMach, _meiMachineFlag ? 10 : 2, 631, true);
}
@@ -2428,7 +2428,7 @@ void Room204::daemon() {
case 632:
deleteMeiCheiHotspot();
addMovingMeiHotspot();
- _fieldE0 = _fieldE4_walkerDestX;
+ _fieldE0_x = _fieldE4_walkerDestX;
break;
@@ -2477,7 +2477,7 @@ void Room204::daemon() {
case 639:
_fieldD4 = 4;
- _fieldDC = 1;
+ _meiMachineFlag = true;
_field108 = 1;
kernel_timing_trigger(1, 574, nullptr);
_fieldBC_trigger = kernel_trigger_create(588);
@@ -2582,18 +2582,18 @@ void Room204::daemon() {
case 669:
DisposePath(_mcMach->walkPath);
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 555;
_mcMach->walkPath = CreateCustomPath(555, 323, -1);
ws_custom_walk(_mcMach, 10, 670, true);
- _fieldDC = 1;
+ _meiMachineFlag = true;
break;
case 670:
kernel_timing_trigger(1, 630, nullptr);
- _fieldDC = 1;
- _fieldE0 = 555;
+ _meiMachineFlag = true;
+ _fieldE0_x = 555;
killPriestWalkerMach();
deleteMeiCheiHotspot();
@@ -2716,7 +2716,7 @@ void Room204::daemon() {
case 694:
_fieldD4 = 5;
- _fieldDC = 1;
+ _meiMachineFlag = true;
_field108 = 1;
kernel_timing_trigger(1, 574, nullptr);
_fieldBC_trigger = kernel_trigger_create(695);
@@ -2753,7 +2753,7 @@ void Room204::daemon() {
case 702:
DisposePath(_mcMach->walkPath);
- _fieldDC = 1;
+ _meiMachineFlag = true;
_fieldE4_walkerDestX = 555;
_mcMach->walkPath = CreateCustomPath(555, 323, -1);
ws_custom_walk(_mcMach, 10, 703, true);
@@ -2764,8 +2764,8 @@ void Room204::daemon() {
kernel_timing_trigger(1, 630, nullptr);
midi_fade_volume(0, 120);
kernel_timing_trigger(120, 1995, nullptr);
- _fieldDC = 1;
- _fieldE0 = 555;
+ _meiMachineFlag = true;
+ _fieldE0_x = 555;
deleteMeiCheiHotspot();
addMovingMeiHotspot();
player_set_commands_allowed(true);
@@ -2966,22 +2966,22 @@ void Room204::setWalkerDestX() {
if (_G(player_info).x > 0 && _G(player_info).x <= 639) {
_fieldE4_walkerDestX = 555;
- _fieldDC = 1;
+ _meiMachineFlag = true;
}
if (_G(player_info).x >= 640 && _G(player_info).x <= 959) {
_fieldE4_walkerDestX = 800;
- _fieldDC = 1;
+ _meiMachineFlag = true;
}
if (_G(player_info).x >= 960 && _G(player_info).x <= 1279) {
_fieldE4_walkerDestX = 1245;
- _fieldDC = 0;
+ _meiMachineFlag = false;
}
if (_G(player_info).x >= 1280) {
_fieldE4_walkerDestX = 1494;
- _fieldDC = 0;
+ _meiMachineFlag = false;
}
}
@@ -3001,9 +3001,9 @@ void Room204::deleteMeiCheiHotspot() {
}
void Room204::conv204a() {
- int32 node = conv_current_node();
- int32 entry = conv_current_entry();
- int32 who = conv_whos_talking();
+ const int32 node = conv_current_node();
+ const int32 entry = conv_current_entry();
+ const int32 who = conv_whos_talking();
if (node == 20)
_field164 = 1;
diff --git a/engines/m4/riddle/rooms/section2/room204.h b/engines/m4/riddle/rooms/section2/room204.h
index 8491c1533e7..76a5655d810 100644
--- a/engines/m4/riddle/rooms/section2/room204.h
+++ b/engines/m4/riddle/rooms/section2/room204.h
@@ -56,6 +56,9 @@ private:
int32 _dword1A189C = 0;
+ bool _ripMachineFlag = false;
+ bool _meiMachineFlag = false;
+
int32 _field4 = 0;
int32 _field10 = 0;
int32 _field14 = 0;
@@ -69,7 +72,6 @@ private:
int32 _field40 = 0;
int32 _field44_triggerNum = 0;
int32 _field48_triggerNum = 0;
- int32 _field68 = 0;
int32 _ripBangsBongSeries = 0;
int32 _fieldBC_trigger = 0;
int32 _fieldC0_trigger = 0;
@@ -79,8 +81,7 @@ private:
int32 _fieldD0 = 0;
int32 _fieldD4 = 0;
int32 _fieldD8_facing = 0;
- int32 _fieldDC = 0;
- int32 _fieldE0 = 0;
+ int32 _fieldE0_x = 0;
int32 _fieldE4_walkerDestX = 0;
int32 _fieldEC = 0;
int32 _fieldF0 = 0;
diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index 30564fc446d..bc6088af436 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -1167,7 +1167,7 @@ void Room205::daemon() {
case 547:
ws_hide_walker(_kuangWalker205Mach);
_kuangsShadow2Mach = series_show("KUANGS SHADOW 2", 3840, 16, -1, -1, 0, 52, 394, 254);
- _kuangTalkerMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 3584, 0, triggerMachineByHashCallback, "kuang talker");
+ _kuangTalkerMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 3584, false, triggerMachineByHashCallback, "kuang talker");
sendWSMessage_10000(1, _kuangTalkerMach, _205ktlk1Series, 1, 1, -1, _205ktlk1Series, 1, 5, 1);
sendWSMessage_1a0000(_kuangTalkerMach, 11);
digi_play("205K03", 1, 255, 548, -1);
@@ -1345,7 +1345,7 @@ void Room205::daemon() {
case 567:
terminateMachine(_205all0Mach);
series_unload(_205all4Series);
- _205all0Mach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 3840, 0, triggerMachineByHashCallback, "rip talker");
+ _205all0Mach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 3840, false, triggerMachineByHashCallback, "rip talker");
sendWSMessage_10000(1, _205all0Mach, _205rtlk2Series, 1, 14, -1, _205rtlk2Series, 4, 14, 4);
digi_play("205r06", 1, 255, 568, -1);
diff --git a/engines/m4/riddle/rooms/section2/room207.cpp b/engines/m4/riddle/rooms/section2/room207.cpp
index 736889fe1c1..5eb83f55aef 100644
--- a/engines/m4/riddle/rooms/section2/room207.cpp
+++ b/engines/m4/riddle/rooms/section2/room207.cpp
@@ -326,7 +326,7 @@ void Room207::parser() {
ws_hide_walker(_G(my_walker));
_ripHeadDownTalkOffTd33Series = series_load("rip head down talk off td33", -1, nullptr);
_ripTrekArmsXPos3Series = series_load("rip trek arms x pos3", -1, nullptr);
- _ripInConvMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 1024, 0, triggerMachineByHashCallback, "rip in conv");
+ _ripInConvMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 1024, false, triggerMachineByHashCallback, "rip in conv");
_G(kernel).trigger_mode = KT_DAEMON;
_fieldC6 = false;
_fieldC2 = 1;
@@ -1436,7 +1436,7 @@ void Room207::daemon() {
case 11:
terminateMachine(_ppSquatMach);
- _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, 0, triggerMachineByHashCallback, "pp squat");
+ _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, false, triggerMachineByHashCallback, "pp squat");
sendWSMessage_10000(1, _ppSquatMach, _peskyRockLoopSeries, 1, 1, 100, _peskyRockLoopSeries, 1, 1, 0);
_G(kernel).trigger_mode = KT_PARSE;
kernel_timing_trigger(1, 4, nullptr);
@@ -1447,7 +1447,7 @@ void Room207::daemon() {
case 12:
terminateMachine(_ppSquatMach);
- _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, 0, triggerMachineByHashCallback, "pp squat");
+ _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, false, triggerMachineByHashCallback, "pp squat");
if (inv_object_is_here("REBUS AMULET"))
_rebusAmuletMach = series_show_sprite("rebus amulet", 0, 3840);
@@ -1552,7 +1552,7 @@ void Room207::daemon() {
_peasantMode = 14;
} else if (_peasantShould == 16) {
terminateMachine(_ppSquatMach);
- _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, 0, triggerMachineByHashCallback, "pp squat");
+ _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, false, triggerMachineByHashCallback, "pp squat");
sendWSMessage_10000(1, _ppSquatMach, _peskyBegLoopSeries, 1, 15, 110, _peskyBegLoopSeries, 15, 15, 0);
_peasantMode = 16;
} else if (_peasantShould <= 0) {
@@ -1628,7 +1628,7 @@ void Room207::daemon() {
case 105:
terminateMachine(_ppSquatMach);
- _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, 0, triggerMachineByHashCallback, "pp squat");
+ _ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 3840, false, triggerMachineByHashCallback, "pp squat");
sendWSMessage_10000(1, _ppSquatMach, _peskyRockLoopSeries, 1, 1, 100, _peskyRockLoopSeries, 1, 1, 0);
_peasantMode = 0;
More information about the Scummvm-git-logs
mailing list