[Scummvm-git-logs] scummvm master -> 1190b4673f6323fda75ab255e6ca1ddfc28ef02c
Strangerke
noreply at scummvm.org
Mon Feb 10 08:53:38 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:
1190b4673f M4: RIDDLE: Fix calls to ws_demand_location in room group 4 and 5
Commit: 1190b4673f6323fda75ab255e6ca1ddfc28ef02c
https://github.com/scummvm/scummvm/commit/1190b4673f6323fda75ab255e6ca1ddfc28ef02c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T09:53:31+01:00
Commit Message:
M4: RIDDLE: Fix calls to ws_demand_location in room group 4 and 5
Changed paths:
engines/m4/riddle/rooms/section4/room401.cpp
engines/m4/riddle/rooms/section4/room402.cpp
engines/m4/riddle/rooms/section4/room403.cpp
engines/m4/riddle/rooms/section4/room404.cpp
engines/m4/riddle/rooms/section4/room405.cpp
engines/m4/riddle/rooms/section4/room406.cpp
engines/m4/riddle/rooms/section4/room407.cpp
engines/m4/riddle/rooms/section4/room408.cpp
engines/m4/riddle/rooms/section4/room409.cpp
engines/m4/riddle/rooms/section5/room501.cpp
engines/m4/riddle/rooms/section5/room504.cpp
engines/m4/riddle/rooms/section5/room506.cpp
engines/m4/riddle/rooms/section5/room508.cpp
engines/m4/riddle/rooms/section5/room509.cpp
engines/m4/riddle/rooms/section5/room510.cpp
engines/m4/riddle/rooms/section6/room642.cpp
diff --git a/engines/m4/riddle/rooms/section4/room401.cpp b/engines/m4/riddle/rooms/section4/room401.cpp
index 3e4ec2bc047..038d80c7b10 100644
--- a/engines/m4/riddle/rooms/section4/room401.cpp
+++ b/engines/m4/riddle/rooms/section4/room401.cpp
@@ -82,7 +82,7 @@ void Room401::init() {
}
player_set_commands_allowed(false);
- ws_demand_location(66, 266, 3);
+ ws_demand_location(_G(my_walker), 66, 266, 3);
if (_val1 ||
!_G(flags)[V020] ||
diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index 2fb449a697d..199acb7d89b 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -148,13 +148,13 @@ void Room402::init() {
break;
case 408:
- ws_demand_location(517, 239, 3);
+ ws_demand_location(_G(my_walker), 517, 239, 3);
ws_walk(510, 260, nullptr, 50, 8);
break;
default:
digi_preload("950_s22");
- ws_demand_location(660, 290, 3);
+ ws_demand_location(_G(my_walker), 660, 290, 3);
ws_walk(612, 287, nullptr, 50, 9);
midi_fade_volume(0, 120);
break;
@@ -225,27 +225,27 @@ void Room402::init() {
sendWSMessage_10000(1, _wolfieMach, _wolfClipping, 1, 10, 110,
_wolfClipping, 10, 10, 0);
- ws_demand_location(517, 239, 3);
+ ws_demand_location(_G(my_walker), 517, 239, 3);
ws_walk(503, 248, nullptr, 350, 7);
} else if (_G(flags)[V117] != 0 && inv_player_has("TURTLE")) {
_G(flags)[V117] = 0;
hotspot_set_active("TOPIARY ", true);
_G(flags)[kWolfLocation] = 408;
- ws_demand_location(517, 239, 3);
+ ws_demand_location(_G(my_walker), 517, 239, 3);
_wolfWalker = triggerMachineByHash_3000(8, 8, *S4_NORMAL_DIRS, *S4_SHADOW_DIRS,
475, 300, 11, triggerMachineByHashCallback3000, "wolf_walker");
sendWSMessage_10000(_wolfWalker, 549, 239, 9, 42, 0);
kernel_timing_trigger(90, 40);
} else {
- ws_demand_location(517, 239, 3);
+ ws_demand_location(_G(my_walker), 517, 239, 3);
ws_walk(449, 317, nullptr, 30, 3);
}
break;
default:
digi_preload("950_s22");
- ws_demand_location(660, 290, 3);
+ ws_demand_location(_G(my_walker), 660, 290, 3);
ws_walk(449, 317, nullptr, 30, 3);
midi_fade_volume(0, 120);
@@ -265,7 +265,7 @@ void Room402::init() {
sendWSMessage_10000(1, _wolfieMach, _wolfClipping, 1, 10, 110,
_wolfClipping, 10, 10, 0);
- ws_demand_location(517, 239, 3);
+ ws_demand_location(_G(my_walker), 517, 239, 3);
ws_walk(510, 260, nullptr, 370, 8);
}
@@ -378,7 +378,7 @@ void Room402::daemon() {
terminateMachineAndNull(_ripEnterLeave);
series_unload(_ripDownStairs);
ws_unhide_walker();
- ws_demand_location(345, 275, 3);
+ ws_demand_location(_G(my_walker), 345, 275, 3);
ws_walk(375, 279, nullptr,
(_G(flags)[kWolfLocation] == 402) ? 56 : 50,
4);
diff --git a/engines/m4/riddle/rooms/section4/room403.cpp b/engines/m4/riddle/rooms/section4/room403.cpp
index 61d40829a10..cc81d367b76 100644
--- a/engines/m4/riddle/rooms/section4/room403.cpp
+++ b/engines/m4/riddle/rooms/section4/room403.cpp
@@ -103,7 +103,7 @@ void Room403::init() {
}
MoveScreenDelta(-640, 0);
- ws_demand_location(1172, 322, 3);
+ ws_demand_location(_G(my_walker), 1172, 322, 3);
ws_walk(1172, 322, nullptr, 400, 1);
} else if (_G(flags)[V139] == 4) {
@@ -111,7 +111,7 @@ void Room403::init() {
_ladder = series_place_sprite("LADDER LEANS AGAINST WALL", 0, 0, 0, 100, 0xf00);
hotspot_set_active("STEP LADDER ", true);
MoveScreenDelta(-640, 0);
- ws_demand_location(1083, 322, 3);
+ ws_demand_location(_G(my_walker), 1083, 322, 3);
ws_walk(1201, 321, nullptr, 420, 2);
} else {
@@ -223,7 +223,7 @@ void Room403::init() {
_G(flags)[V132] = 0;
_G(camera_reacts_to_player) = false;
MoveScreenDelta(-640, 0);
- ws_demand_location(620, 326, 3);
+ ws_demand_location(_G(my_walker), 620, 326, 3);
ws_walk_load_shadow_series(S4_SHADOW_DIRS, S4_SHADOW_NAMES);
ws_walk_load_walker_series(S4_NORMAL_DIRS, S4_NORMAL_NAMES);
kernel_timing_trigger(1, 310);
diff --git a/engines/m4/riddle/rooms/section4/room404.cpp b/engines/m4/riddle/rooms/section4/room404.cpp
index 13ccb669ecf..67389764751 100644
--- a/engines/m4/riddle/rooms/section4/room404.cpp
+++ b/engines/m4/riddle/rooms/section4/room404.cpp
@@ -86,7 +86,7 @@ void Room404::init() {
triggerMachineByHashCallback, "BUTLER talks rip");
sendWSMessage_10000(1, _butlerTalks, _butlerTalkLoop, 1, 1, -1,
_butlerTalkLoop, 1, 1, 0);
- ws_demand_location(58, 347, 3);
+ ws_demand_location(_G(my_walker), 58, 347, 3);
ws_walk(90, 347, nullptr, 50, 3);
break;
@@ -95,7 +95,7 @@ void Room404::init() {
triggerMachineByHashCallback, "BUTLER talks rip");
sendWSMessage_10000(1, _butlerTalks, _butlerTalkLoop, 1, 1, -1,
_butlerTalkLoop, 1, 1, 0);
- ws_demand_location(174, 268, 3);
+ ws_demand_location(_G(my_walker), 174, 268, 3);
ws_walk(250, 285, nullptr,
inv_player_has("BILLIARD BALL") ? 70 : 60,
3, 1);
@@ -104,7 +104,7 @@ void Room404::init() {
default:
ws_walk_load_shadow_series(SHADOW_DIRS, SHADOW_NAMES);
ws_walk_load_walker_series(NORMAL_DIRS, NORMAL_NAMES);
- ws_demand_location(340, 480, 2);
+ ws_demand_location(_G(my_walker), 340, 480, 2);
_machine1 = triggerMachineByHash_3000(8, 10, *NORMAL_DIRS, *SHADOW_DIRS,
380, 421, 1, triggerMachineByHashCallback3000, "BUTLER_walker");
diff --git a/engines/m4/riddle/rooms/section4/room405.cpp b/engines/m4/riddle/rooms/section4/room405.cpp
index f14bc06b8ac..1abfbe4c448 100644
--- a/engines/m4/riddle/rooms/section4/room405.cpp
+++ b/engines/m4/riddle/rooms/section4/room405.cpp
@@ -93,7 +93,7 @@ void Room405::init() {
if (!inv_player_has("TURTLE"))
inv_move_object("TURTLE", 305);
- ws_demand_location(155, 370, 9);
+ ws_demand_location(_G(my_walker), 155, 370, 9);
if (player_been_here(405) || _G(kittyScreaming)) {
ws_walk(230, 345, nullptr, 50, 2);
@@ -136,7 +136,7 @@ void Room405::daemon() {
break;
case 22:
- ws_demand_location(286, 324, 7);
+ ws_demand_location(_G(my_walker), 286, 324, 7);
ws_hide_walker(_baron);
sendWSMessage_150000(-1);
ws_hide_walker(_G(my_walker));
diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index 6dea2633bf7..e5e4ce61669 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -195,7 +195,7 @@ void Room406::init() {
if (_G(flags)[kBilliardsFan])
digi_play_loop("456_s03a", 3, 255, -1, 456);
- ws_demand_location(400, 340, 1);
+ ws_demand_location(_G(my_walker), 400, 340, 1);
_ripHiHand = series_load("rip trek hi 1 hand");
setGlobals1(_ripHiHand, 1, 5, 5, 5, 0, 5, 1, 1, 1);
sendWSMessage_110000(310);
@@ -207,7 +207,7 @@ void Room406::init() {
digi_play_loop("456_s03a", 3, 255, -1, 456);
}
- ws_demand_location(603, 327, 9);
+ ws_demand_location(_G(my_walker), 603, 327, 9);
ws_walk(530, 332, nullptr, 300, 9);
break;
}
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index dd6196d7992..2bb31f074bc 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -525,7 +525,7 @@ void Room407::init() {
midi_play("DRAMA1", 255, 0, -1, 949);
_ripEnters = series_load("407 RIP ENTERS");
_stair = series_load("407STAIR");
- ws_demand_location(250, 331, 3);
+ ws_demand_location(_G(my_walker), 250, 331, 3);
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0xe00, 0,
@@ -562,7 +562,7 @@ void Room407::init() {
_pumpState = 1130;
setHotspots();
- ws_demand_location(260, 335, 3);
+ ws_demand_location(_G(my_walker), 260, 335, 3);
}
}
diff --git a/engines/m4/riddle/rooms/section4/room408.cpp b/engines/m4/riddle/rooms/section4/room408.cpp
index 043707ff0f1..6effba29a5f 100644
--- a/engines/m4/riddle/rooms/section4/room408.cpp
+++ b/engines/m4/riddle/rooms/section4/room408.cpp
@@ -57,7 +57,7 @@ void Room408::init() {
_edger = series_place_sprite("Edger gone", 0, 0, -53, 100, 0xf00);
hotspot_set_active("EDGER", true);
inv_move_object("EDGER", 408);
- ws_demand_location(234, 319, 3);
+ ws_demand_location(_G(my_walker), 234, 319, 3);
ws_walk(438, 325, nullptr, 400, 1);
} else if (_G(flags)[V139] == 3) {
@@ -68,7 +68,7 @@ void Room408::init() {
hotspot_set_active("PLANK", true);
}
- ws_demand_location(-20, 345, 3);
+ ws_demand_location(_G(my_walker), -20, 345, 3);
ws_walk(234, 319, nullptr, 420, 1);
} else {
@@ -118,7 +118,7 @@ void Room408::init() {
_wolfShould = 2200;
}
- ws_demand_location(-20, 345, 3);
+ ws_demand_location(_G(my_walker), -20, 345, 3);
ws_walk(35, 345, nullptr, 20, 3);
}
break;
@@ -139,7 +139,7 @@ void Room408::init() {
}
_ripExits = series_load("RIP EXITS 407");
- ws_demand_location(201, 287, 4);
+ ws_demand_location(_G(my_walker), 201, 287, 4);
ws_hide_walker();
_exit = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0, 0,
@@ -168,7 +168,7 @@ void Room408::init() {
_wolfShould = 2200;
}
- ws_demand_location(660, 345, 9);
+ ws_demand_location(_G(my_walker), 660, 345, 9);
if (_G(flags)[V125] == 3) {
series_simple_play("408 turtle popup", 0, true);
diff --git a/engines/m4/riddle/rooms/section4/room409.cpp b/engines/m4/riddle/rooms/section4/room409.cpp
index fc5da30723d..e0e8b7b454c 100644
--- a/engines/m4/riddle/rooms/section4/room409.cpp
+++ b/engines/m4/riddle/rooms/section4/room409.cpp
@@ -33,7 +33,7 @@ void Room409::init() {
digi_preload("409r01b");
digi_preload("409r01c");
digi_preload("950_s27");
- ws_demand_location(239, 295, 3);
+ ws_demand_location(_G(my_walker), 239, 295, 3);
_seriesShadow = series_load("SAFARI SHADOW 3");
_seriesDoorOpen = series_load("409 DOOR OPEN");
diff --git a/engines/m4/riddle/rooms/section5/room501.cpp b/engines/m4/riddle/rooms/section5/room501.cpp
index 91c146a0d1b..25713830a7f 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -76,7 +76,7 @@ void Room501::init() {
++_val4;
}
- ws_demand_location(588, 267, 9);
+ ws_demand_location(_G(my_walker), 588, 267, 9);
ws_walk(287, 268, nullptr, 522, 9);
_val5 = 0;
_trigger1 = -1;
diff --git a/engines/m4/riddle/rooms/section5/room504.cpp b/engines/m4/riddle/rooms/section5/room504.cpp
index 2f2691e6ddf..f8ab16685a0 100644
--- a/engines/m4/riddle/rooms/section5/room504.cpp
+++ b/engines/m4/riddle/rooms/section5/room504.cpp
@@ -64,7 +64,7 @@ void Room504::init() {
case 506:
player_set_commands_allowed(false);
- ws_demand_location(1384, 205, 9);
+ ws_demand_location(_G(my_walker), 1384, 205, 9);
ws_hide_walker();
MoveScreenDelta(_G(game_buff_ptr), -1280, 0);
_isOnRight = true;
@@ -79,7 +79,7 @@ void Room504::init() {
default:
player_set_commands_allowed(false);
- ws_demand_location(50, 226, 3);
+ ws_demand_location(_G(my_walker), 50, 226, 3);
midi_play("MOCAMO", 200, 0, -1, 949);
if (player_been_here(504)) {
@@ -189,6 +189,7 @@ void Room504::daemon() {
digi_play("504_s02b", 2, _volume2);
break;
case 4:
+ default:
digi_play("504_s02c", 2, _volume2);
break;
}
@@ -994,7 +995,7 @@ void Room504::daemon() {
case 565:
ws_unhide_walker();
- ws_demand_location(170, 145, 1);
+ ws_demand_location(_G(my_walker), 170, 145, 1);
_isOnRight = false;
kernel_timing_trigger(5, 566);
break;
@@ -1070,7 +1071,7 @@ void Room504::daemon() {
case 578:
ws_unhide_walker();
- ws_demand_location(532, 165, 3);
+ ws_demand_location(_G(my_walker), 532, 165, 3);
_isOnRight = true;
digi_unload("504_S05");
player_set_commands_allowed(true);
@@ -1266,7 +1267,7 @@ void Room504::daemon() {
break;
case 600:
- ws_demand_location(528, 168, 8);
+ ws_demand_location(_G(my_walker), 528, 168, 8);
ws_unhide_walker();
terminateMachineAndNull(_ripley);
setVinesRope();
@@ -1507,7 +1508,7 @@ void Room504::daemon() {
case 626:
ws_unhide_walker();
- ws_demand_location(200, 153, 3);
+ ws_demand_location(_G(my_walker), 200, 153, 3);
terminateMachineAndNull(_ripley);
series_unload(_ripStepUpLeft);
series_unload(_ripThrowFromLeft);
diff --git a/engines/m4/riddle/rooms/section5/room506.cpp b/engines/m4/riddle/rooms/section5/room506.cpp
index 1a0f4c83d33..bfd6cbf31fd 100644
--- a/engines/m4/riddle/rooms/section5/room506.cpp
+++ b/engines/m4/riddle/rooms/section5/room506.cpp
@@ -69,13 +69,13 @@ void Room506::init() {
MoveScreenDelta(-640, 0);
player_set_commands_allowed(false);
series_play("506 RIP UP STEPS", 0x700, 0, 503, 5);
- ws_demand_location(1054, 346, 12);
+ ws_demand_location(_G(my_walker), 1054, 346, 12);
ws_hide_walker();
break;
case 507:
digi_unload("507_s02");
- ws_demand_location(346, 214, 4);
+ ws_demand_location(_G(my_walker), 346, 214, 4);
ws_walk(420, 234, nullptr, 502, 4);
player_set_commands_allowed(false);
break;
@@ -84,7 +84,7 @@ void Room506::init() {
player_set_commands_allowed(false);
if (_G(flags)[V158]) {
- ws_demand_location(100, 100);
+ ws_demand_location(_G(my_walker), 100, 100);
ws_hide_walker();
digi_preload("506_s02");
digi_unload("508_s01");
@@ -92,14 +92,14 @@ void Room506::init() {
series_stream_break_on_frame(_domeRotation, 45, 500);
digi_play("506_S02", 1);
} else {
- ws_demand_location(346, 214, 4);
+ ws_demand_location(_G(my_walker), 346, 214, 4);
ws_walk(420, 234, nullptr, 502, 4);
}
break;
default:
MoveScreenDelta(-432, 0);
- ws_demand_location(754, 242, 8);
+ ws_demand_location(_G(my_walker), 754, 242, 8);
ws_walk(697, 247, nullptr, 502, 8);
break;
}
diff --git a/engines/m4/riddle/rooms/section5/room508.cpp b/engines/m4/riddle/rooms/section5/room508.cpp
index 6013dc434ee..bb5c09eeb47 100644
--- a/engines/m4/riddle/rooms/section5/room508.cpp
+++ b/engines/m4/riddle/rooms/section5/room508.cpp
@@ -52,7 +52,7 @@ void Room508::init() {
digi_play("508_S04", 2);
} else if (_G(game).previous_room != KERNEL_RESTORING_GAME) {
- ws_demand_location(246, 265, 5);
+ ws_demand_location(_G(my_walker), 246, 265, 5);
ws_walk(256, 283, nullptr, 562, 5);
}
@@ -396,7 +396,7 @@ void Room508::daemon() {
case 673:
terminateMachineAndNull(_ripley);
ws_unhide_walker();
- ws_demand_location(437, 349, 1);
+ ws_demand_location(_G(my_walker), 437, 349, 1);
ws_walk(436, 359, nullptr, 548, 10);
break;
diff --git a/engines/m4/riddle/rooms/section5/room509.cpp b/engines/m4/riddle/rooms/section5/room509.cpp
index fcc9f95da5b..3acc271731d 100644
--- a/engines/m4/riddle/rooms/section5/room509.cpp
+++ b/engines/m4/riddle/rooms/section5/room509.cpp
@@ -44,13 +44,13 @@ void Room509::init() {
case 510:
player_set_commands_allowed(false);
- ws_demand_location(289, 261, 6);
+ ws_demand_location(_G(my_walker), 289, 261, 6);
kernel_timing_trigger(1, 3);
break;
default:
player_set_commands_allowed(false);
- ws_demand_location(342, 320, 2);
+ ws_demand_location(_G(my_walker), 342, 320, 2);
kernel_timing_trigger(1, 2);
_flag1 = !player_been_here(509);
break;
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 66aee623d87..99d53f365c2 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -135,7 +135,7 @@ void Room510::init() {
player_set_commands_allowed(false);
_stepsSeries = series_load("510 UP STEPS");
_steps = series_play("510 UP STEPS", 0xf00, 0, 110, 5);
- ws_demand_location(409, 86, 11);
+ ws_demand_location(_G(my_walker), 409, 86, 11);
ws_hide_walker();
}
@@ -358,7 +358,7 @@ void Room510::parser() {
}
ws_unhide_walker();
- ws_demand_location(425, 128, 11);
+ ws_demand_location(_G(my_walker), 425, 128, 11);
kernel_timing_trigger(1, 6);
break;
case 6:
@@ -590,7 +590,7 @@ void Room510::parser() {
}
ws_unhide_walker();
- ws_demand_location(425, 128, 11);
+ ws_demand_location(_G(my_walker), 425, 128, 11);
_G(flags)[V170] = 0;
player_set_commands_allowed(true);
break;
diff --git a/engines/m4/riddle/rooms/section6/room642.cpp b/engines/m4/riddle/rooms/section6/room642.cpp
index 68d04d3658f..6279d92acb9 100644
--- a/engines/m4/riddle/rooms/section6/room642.cpp
+++ b/engines/m4/riddle/rooms/section6/room642.cpp
@@ -34,22 +34,22 @@ void Room642::init() {
break;
case 636:
- ws_demand_location(307, 347, 11);
+ ws_demand_location(_G(my_walker), 307, 347, 11);
break;
case 641:
- ws_demand_location(-30, 328, 3);
+ ws_demand_location(_G(my_walker), -30, 328, 3);
ws_walk(32, 328, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 648:
- ws_demand_location(280, 270, 5);
+ ws_demand_location(_G(my_walker), 280, 270, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(307, 347, 11);
+ ws_demand_location(_G(my_walker), 307, 347, 11);
break;
}
More information about the Scummvm-git-logs
mailing list