[Scummvm-git-logs] scummvm master -> 021cca386076a0e95329637b5d911a4622b0f3e5
dreammaster
noreply at scummvm.org
Wed Nov 20 15:29:15 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:
021cca3860 M4: RIDDLE: Fix Twelvetrees walk crash
Commit: 021cca386076a0e95329637b5d911a4622b0f3e5
https://github.com/scummvm/scummvm/commit/021cca386076a0e95329637b5d911a4622b0f3e5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-20T07:28:55-08:00
Commit Message:
M4: RIDDLE: Fix Twelvetrees walk crash
Changed paths:
engines/m4/riddle/rooms/section6/room603.cpp
engines/m4/riddle/rooms/section6/room605.cpp
engines/m4/riddle/rooms/section6/room608.cpp
engines/m4/riddle/rooms/section6/section6.cpp
engines/m4/riddle/rooms/section6/section6.h
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index eea7f803ff0..3abf7e6d8dc 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -867,8 +867,8 @@ void Room603::daemon() {
break;
case 16:
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
sendWSMessage_10000(1, _tt, _tt03, 122, 112, 402, _tt03, 112, 112, 0);
break;
@@ -888,8 +888,8 @@ void Room603::daemon() {
break;
case 20:
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
sendWSMessage_10000(1, _tt, _tt03, 122, 112, 410, _tt03, 112, 112, 0);
break;
@@ -958,7 +958,7 @@ void Room603::daemon() {
_trigger1 = 0;
terminateMachineAndNull(_ttShadow);
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
291, 293, 4, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 357, 283, 1, 405, 0);
conv_resume();
@@ -980,7 +980,7 @@ void Room603::daemon() {
case 410:
terminateMachineAndNull(_tt);
terminateMachineAndNull(_ttShadow);
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
291, 293, 4, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 397, 286, 2, 415, 0);
kernel_timing_trigger(200, 411);
@@ -1093,14 +1093,14 @@ void Room603::daemon() {
break;
case 20:
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
sendWSMessage_10000(1, _tt, _tt03, 83, 111, 510, _tt03, 111, 111, 0);
break;
case 21:
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
sendWSMessage_10000(1, _tt, _tt03, 83, 112, 530, _tt03, 112, 112, 1);
break;
@@ -1175,7 +1175,7 @@ void Room603::daemon() {
case 510:
terminateMachineAndNull(_tt);
_trigger1 = 0;
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
291, 293, 4, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 357, 283, 3, 0x200, 0);
kernel_timing_trigger(100, 511);
@@ -1201,7 +1201,7 @@ void Room603::daemon() {
case 530:
terminateMachineAndNull(_tt);
_trigger1 = 0;
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
291, 293, 4, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 397, 286, 2, 533, 0);
kernel_timing_trigger(70, 531);
diff --git a/engines/m4/riddle/rooms/section6/room605.cpp b/engines/m4/riddle/rooms/section6/room605.cpp
index 814348c5ce2..1af41f67989 100644
--- a/engines/m4/riddle/rooms/section6/room605.cpp
+++ b/engines/m4/riddle/rooms/section6/room605.cpp
@@ -62,8 +62,8 @@ void Room605::init() {
case KERNEL_RESTORING_GAME:
if (_G(flags)[V203] == 2) {
_G(player).disable_hyperwalk = true;
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
_tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, 0,
triggerMachineByHashCallback, "tt");
sendWSMessage_10000(1, _tt, _605tt, 1, 1, 200, _605tt, 1, 1, 0);
@@ -85,9 +85,9 @@ void Room605::init() {
ws_demand_location(451, 368, 1);
ws_walk(513, 316, nullptr, -1, 10);
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
450, 339, 1, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 476, 290, 5, 10, 1);
@@ -281,7 +281,7 @@ void Room605::daemon() {
case 203:
terminateMachineAndNull(_tt);
terminateMachineAndNull(_ttShadow);
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
476, 290, 5, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 485, 199, 2, 208, 0);
digi_play("19_07n04", 1, 255, 206);
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index 33a50b430b1..c0b8f0e77bd 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -138,10 +138,10 @@ void Room608::init() {
ws_demand_location(-30, 345, 1);
ws_walk(43, 345, nullptr, 18, 3);
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
-30, 324, 3, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 105, 324, 5, 20, 1);
} else if (_G(flags)[V203] == 6) {
@@ -159,10 +159,10 @@ void Room608::init() {
ws_demand_location(-30, 345, 1);
kernel_timing_trigger(1, 698);
- ws_walk_load_walker_series(SECTION6_NORMAL_DIRS, SECTION6_NORMAL_NAMES);
- ws_walk_load_shadow_series(SECTION6_SHADOW_DIRS, SECTION6_SHADOW_NAMES);
+ ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
+ ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
- _tt = triggerMachineByHash_3000(8, 9, *SECTION6_NORMAL_DIRS, *SECTION6_SHADOW_DIRS,
+ _tt = triggerMachineByHash_3000(8, 9, *TT_NORMAL_DIRS, *TT_SHADOW_DIRS,
-30, 324, 3, triggerMachineByHashCallback3000, "tt walker");
sendWSMessage_10000(_tt, 103, 318, 3, 700, 1);
}
@@ -1284,10 +1284,10 @@ void Room608::daemon() {
series_unload(_ripHandChin);
series_unload(_ripTalker);
- series_load(SECTION6_NORMAL_NAMES[0], SECTION6_NORMAL_DIRS[0]);
- series_load(SECTION6_NORMAL_NAMES[1], SECTION6_NORMAL_DIRS[1]);
- series_load(SECTION6_NORMAL_NAMES[3], SECTION6_NORMAL_DIRS[3]);
- series_load(SECTION6_NORMAL_NAMES[4], SECTION6_NORMAL_DIRS[4]);
+ series_load(TT_NORMAL_NAMES[0], TT_NORMAL_DIRS[0]);
+ series_load(TT_NORMAL_NAMES[1], TT_NORMAL_DIRS[1]);
+ series_load(TT_NORMAL_NAMES[3], TT_NORMAL_DIRS[3]);
+ series_load(TT_NORMAL_NAMES[4], TT_NORMAL_DIRS[4]);
ws_hide_walker(_tt);
_ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
diff --git a/engines/m4/riddle/rooms/section6/section6.cpp b/engines/m4/riddle/rooms/section6/section6.cpp
index 082364f06dd..a0d4c7bc093 100644
--- a/engines/m4/riddle/rooms/section6/section6.cpp
+++ b/engines/m4/riddle/rooms/section6/section6.cpp
@@ -26,13 +26,13 @@ namespace M4 {
namespace Riddle {
namespace Rooms {
-const int16 SECTION6_NORMAL_DIRS[] = { 200, 201, 202, 203, -1 };
-const char *SECTION6_NORMAL_NAMES[] = {
+const int16 TT_NORMAL_DIRS[] = { 200, 201, 202, 203, 204, -1 };
+const char *TT_NORMAL_NAMES[] = {
"tt walker 1", "tt walker 2", "tt walker 3",
"tt walker 4", "tt walker 5"
};
-const int16 SECTION6_SHADOW_DIRS[] = { 210, 211, 212, 213, -1 };
-const char *SECTION6_SHADOW_NAMES[] = {
+const int16 TT_SHADOW_DIRS[] = { 210, 211, 212, 213, 214, -1 };
+const char *TT_SHADOW_NAMES[] = {
"tt walker shadow 1", "tt walker shadow 2",
"tt walker shadow 3", "tt walker shadow 4",
"tt walker shadow 5"
diff --git a/engines/m4/riddle/rooms/section6/section6.h b/engines/m4/riddle/rooms/section6/section6.h
index 7c07c98b33a..e659d964f11 100644
--- a/engines/m4/riddle/rooms/section6/section6.h
+++ b/engines/m4/riddle/rooms/section6/section6.h
@@ -66,10 +66,10 @@ namespace M4 {
namespace Riddle {
namespace Rooms {
-extern const int16 SECTION6_NORMAL_DIRS[];
-extern const char *SECTION6_NORMAL_NAMES[];
-extern const int16 SECTION6_SHADOW_DIRS[];
-extern const char *SECTION6_SHADOW_NAMES[];
+extern const int16 TT_NORMAL_DIRS[];
+extern const char *TT_NORMAL_NAMES[];
+extern const int16 TT_SHADOW_DIRS[];
+extern const char *TT_SHADOW_NAMES[];
class Section6 : public Section {
private:
More information about the Scummvm-git-logs
mailing list