[Scummvm-git-logs] scummvm master -> 3f166cdd749dc6e2db5ffb130a4932eaa1dbdfcb
Strangerke
noreply at scummvm.org
Wed Oct 16 23:03:00 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:
3f166cdd74 M4: RIDDLE: Some renaming in Section8Room
Commit: 3f166cdd749dc6e2db5ffb130a4932eaa1dbdfcb
https://github.com/scummvm/scummvm/commit/3f166cdd749dc6e2db5ffb130a4932eaa1dbdfcb
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-17T01:02:32+01:00
Commit Message:
M4: RIDDLE: Some renaming in Section8Room
Changed paths:
engines/m4/riddle/rooms/section8/room804.cpp
engines/m4/riddle/rooms/section8/room814.cpp
engines/m4/riddle/rooms/section8/room824.cpp
engines/m4/riddle/rooms/section8/room834.cpp
engines/m4/riddle/rooms/section8/room844.cpp
engines/m4/riddle/rooms/section8/section8_room.cpp
engines/m4/riddle/rooms/section8/section8_room.h
diff --git a/engines/m4/riddle/rooms/section8/room804.cpp b/engines/m4/riddle/rooms/section8/room804.cpp
index 75e8f3166c9..c42a2f9a071 100644
--- a/engines/m4/riddle/rooms/section8/room804.cpp
+++ b/engines/m4/riddle/rooms/section8/room804.cpp
@@ -76,7 +76,7 @@ void Room804::init() {
ws_demand_location(_G(my_walker), -10, 325);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, -75, 325, 3, Walker::player_walker_callback, "mc_trek");
- _field70 = 0;
+ _unkArrayIndex = 0;
_guessX = 100;
_guessIndex = 1;
ws_walk(_G(my_walker), 150, 340, nullptr, -1, 3, true);
@@ -92,7 +92,7 @@ void Room804::init() {
ws_demand_location(_G(my_walker), 1925, 325);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 2000, 325, 9, Walker::player_walker_callback, "mc_trek");
- _field70 = 4;
+ _unkArrayIndex = 4;
_guessX = 1815;
_guessIndex = 11;
ws_walk(_G(my_walker), 1765, 345, nullptr, 0, 9, true);
diff --git a/engines/m4/riddle/rooms/section8/room814.cpp b/engines/m4/riddle/rooms/section8/room814.cpp
index 0cb9c12028e..58c02ccdb0c 100644
--- a/engines/m4/riddle/rooms/section8/room814.cpp
+++ b/engines/m4/riddle/rooms/section8/room814.cpp
@@ -72,7 +72,7 @@ void Room814::init() {
ws_demand_location(_G(my_walker), -10, 325);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, -60, 325, 2, Walker::player_walker_callback, "mc_trek");
- _field70 = 0;
+ _unkArrayIndex = 0;
_guessX = 100;
_guessIndex = 1;
ws_walk(_G(my_walker), 150, 355, nullptr, -1, 3, true);
@@ -88,7 +88,7 @@ void Room814::init() {
ws_demand_location(_G(my_walker), 1925, 325);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 2000, 325, 9, Walker::player_walker_callback, "mc_trek");
- _field70 = 4;
+ _unkArrayIndex = 4;
_guessX = 1815;
_guessIndex = 11;
ws_walk(_G(my_walker), 1765, 348, nullptr, 0, 9, true);
diff --git a/engines/m4/riddle/rooms/section8/room824.cpp b/engines/m4/riddle/rooms/section8/room824.cpp
index 5e4b73058fe..b84f1a96eb9 100644
--- a/engines/m4/riddle/rooms/section8/room824.cpp
+++ b/engines/m4/riddle/rooms/section8/room824.cpp
@@ -35,7 +35,7 @@ void Room824::init() {
ws_walk_load_walker_series(S8_SHADOW_DIRS2, S8_SHADOW_NAMES2, false);
}
_ripTakerPos5 = series_load("824fire1", -1, nullptr);
- _unkSerie2 = series_load("824fire2", -1, nullptr);
+ _824fire2Serie = series_load("824fire2", -1, nullptr);
if (_G(flags)[V270] == 824) {
_ripPushMach = series_play("824char1", 32767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
@@ -43,8 +43,8 @@ void Room824::init() {
hotspot_set_active(_G(currentSceneDef).hotspots, "chariot ", false);
}
- _unkMach1 = series_play("824fire1", 4095, 0, -1, 7, -1, 100, 0, 0, 0, -1);
- _unkMach2 = series_play("824fire2", 4095, 0, -1, 7, -1, 100, 0, 0, 0, -1);
+ _824fire1Mach = series_play("824fire1", 4095, 0, -1, 7, -1, 100, 0, 0, 0, -1);
+ _824fire2Mach = series_play("824fire2", 4095, 0, -1, 7, -1, 100, 0, 0, 0, -1);
_var1 = 2;
_var2 = 1;
@@ -81,7 +81,7 @@ void Room824::init() {
ws_demand_location(_G(my_walker), -10, 328);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, -50, 328, 2, Walker::player_walker_callback, "mc_trek");
- _field70 = 0;
+ _unkArrayIndex = 0;
_guessX = 100;
_guessIndex = 1;
ws_walk(_G(my_walker), 150, 355, nullptr, -1, 3, true);
@@ -97,7 +97,7 @@ void Room824::init() {
ws_demand_location(_G(my_walker), 1925, 328);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 2000, 328, 9, Walker::player_walker_callback, "mc_trek");
- _field70 = 4;
+ _unkArrayIndex = 4;
_guessX = 1815;
_guessIndex = 11;
ws_walk(_G(my_walker), 1765, 348, nullptr, -1, 9, true);
diff --git a/engines/m4/riddle/rooms/section8/room834.cpp b/engines/m4/riddle/rooms/section8/room834.cpp
index a90a7eec280..c49c6b2c07b 100644
--- a/engines/m4/riddle/rooms/section8/room834.cpp
+++ b/engines/m4/riddle/rooms/section8/room834.cpp
@@ -75,7 +75,7 @@ void Room834::init() {
ws_demand_location(_G(my_walker), -10, 330);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, -50, 330, 2, Walker::player_walker_callback, "mc_trek");
- _field70 = 0;
+ _unkArrayIndex = 0;
_guessX = 100;
_guessIndex = 1;
ws_walk(_G(my_walker), 150, 355, nullptr, -1, 3, true);
@@ -91,7 +91,7 @@ void Room834::init() {
ws_demand_location(_G(my_walker), 1925, 330);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 2000, 330, 9, Walker::player_walker_callback, "mc_trek");
- _field70 = 4;
+ _unkArrayIndex = 4;
_guessX = 1815;
_guessIndex = 11;
ws_walk(_G(my_walker), 1765, 348, nullptr, -1, 9, true);
diff --git a/engines/m4/riddle/rooms/section8/room844.cpp b/engines/m4/riddle/rooms/section8/room844.cpp
index 9bc894bde51..f543e601df5 100644
--- a/engines/m4/riddle/rooms/section8/room844.cpp
+++ b/engines/m4/riddle/rooms/section8/room844.cpp
@@ -53,7 +53,7 @@ void Room844::init() {
_machArr[3] = nullptr;
if (inv_object_in_scene("wooden beam", 844)) {
- _unkMach3 = series_show("844post", 4095, 0, -1, -1, 0, 100, 0, 0);
+ _844postMach = series_show("844post", 4095, 0, -1, -1, 0, 100, 0, 0);
} else {
hotspot_set_active("wooden beam", false);
}
@@ -80,7 +80,7 @@ void Room844::init() {
ws_demand_location(_G(my_walker), -10, 325);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, -60, 325, 2, Walker::player_walker_callback, "mc_trek");
- _field70 = 0;
+ _unkArrayIndex = 0;
_guessX = 100;
_guessIndex = 1;
ws_walk(_G(my_walker), 150, 355, nullptr, -1, 3, true);
@@ -96,7 +96,7 @@ void Room844::init() {
ws_demand_location(_G(my_walker), 1925, 325);
if (_G(flags)[V276] == 0) {
_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 2000, 325, 9, Walker::player_walker_callback, "mc_trek");
- _field70 = 4;
+ _unkArrayIndex = 4;
_guessX = 1815;
_guessIndex = 11;
ws_walk(_G(my_walker), 1765, 348, nullptr, -1, 9, true);
diff --git a/engines/m4/riddle/rooms/section8/section8_room.cpp b/engines/m4/riddle/rooms/section8/section8_room.cpp
index 08614e1123f..49d9f85db0c 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.cpp
+++ b/engines/m4/riddle/rooms/section8/section8_room.cpp
@@ -111,8 +111,8 @@ int32 Section8Room::daemonSub1(int32 dx, bool ascendingFl) {
hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN ", false);
_guessHotspotName = Common::String("MEI CHEN ");
- _unkArray[i] = 0;
- _field70 = i;
+ _unkArrayIndex = i;
+ _unkArray[_unkArrayIndex] = 0;
_guessX = fullArr[i];
if (ascendingFl)
@@ -279,10 +279,10 @@ void Section8Room::parser() {
case 50:
player_set_commands_allowed(false);
- terminateMachine(_unkMach1);
- terminateMachine(_unkMach2);
- series_unload(_unkSerie1);
- series_unload(_unkSerie2);
+ terminateMachine(_824fire1Mach);
+ terminateMachine(_824fire2Mach);
+ series_unload(_ripTakerPos5);
+ series_unload(_824fire2Serie);
digi_preload("950_s33", -1);
ws_hide_walker(_G(my_walker));
terminateMachine(_ripPushMach);
@@ -525,7 +525,7 @@ void Section8Room::parser() {
break;
case 20:
- terminateMachine(_unkMach3);
+ terminateMachine(_844postMach);
setGlobals3(_ripTrekLowReach, 16, 1);
subD7916(_G(my_walker), 30);
digi_play("844r22", 1, 255, -1, -1);
@@ -672,7 +672,7 @@ void Section8Room::daemon() {
switch (_G(kernel).trigger) {
case 1:
- _byte1A19BC = 1;
+ _byte1A19BC = 1; // Seems to be set once and never accessed otherwise...
_field68 = 0;
player_set_commands_allowed(true);
if (_G(flags)[V276] == 0) {
@@ -687,7 +687,7 @@ void Section8Room::daemon() {
setGlobals3(_meiHandsBehindBack, 1, 17);
subD7916(_mcTrekMach, 4);
_guessHotspotName = Common::String("MEI CHEN ");
- _unkArray[_field70] = 0;
+ _unkArray[_unkArrayIndex] = 0;
kernel_timing_trigger(imath_ranged_rand(1200, 1800), 5, nullptr);
// CHECKME: CouldMakeMem();
}
diff --git a/engines/m4/riddle/rooms/section8/section8_room.h b/engines/m4/riddle/rooms/section8/section8_room.h
index 4994db4db80..95d21509967 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.h
+++ b/engines/m4/riddle/rooms/section8/section8_room.h
@@ -42,9 +42,12 @@ public:
protected:
int32 _byte1A19BC = 0;
int32 _field68 = 0;
- int32 _field70 = 0;
+
+ // The array seems to be set and never read. Idem for the index
+ int32 _unkArrayIndex = 0;
int32 _unkArray[8];
+ int32 _824fire2Serie = 0;
int32 _case7RandVal = 0;
int32 _coordArrayId = 0;
int32 _counter1 = 0;
@@ -65,8 +68,7 @@ protected:
int32 _savedPlayerInfoX = 0;
int32 _savedPlayerInfoY = 0;
int32 _savedRandom = 0;
- int32 _unkSerie1 = 0;
- int32 _unkSerie2 = 0;
+
int32 _var1 = 0;
int32 _var2 = 0;
int32 _var3 = 0;
@@ -76,13 +78,13 @@ protected:
Common::String _currentSeriesName;
Common::String _guessHotspotName;
+ machine *_824fire1Mach = nullptr;
+ machine *_824fire2Mach = nullptr;
+ machine *_844postMach = nullptr;
machine *_dynSerie1Mach = nullptr;
machine *_machArr[4] = {nullptr, nullptr, nullptr, nullptr};
machine *_mcTrekMach = nullptr;
machine *_ripPushMach = nullptr;
- machine *_unkMach1 = nullptr;
- machine *_unkMach2 = nullptr;
- machine *_unkMach3 = nullptr;
int32 subCE498(int32 val1);
void subD7916(machine *machine, int32 trigger);
More information about the Scummvm-git-logs
mailing list