[Scummvm-git-logs] scummvm master -> 5b7376854db1bad440d04b100b489b79c62c3434
Strangerke
noreply at scummvm.org
Mon Feb 10 09:06:02 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:
5b7376854d M4: RIDDLE: Fix calls to ws_demand_location in room group 2 and 3
Commit: 5b7376854db1bad440d04b100b489b79c62c3434
https://github.com/scummvm/scummvm/commit/5b7376854db1bad440d04b100b489b79c62c3434
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T10:05:55+01:00
Commit Message:
M4: RIDDLE: Fix calls to ws_demand_location in room group 2 and 3
Changed paths:
engines/m4/riddle/rooms/section2/room201.cpp
engines/m4/riddle/rooms/section2/room203.cpp
engines/m4/riddle/rooms/section3/room301.cpp
engines/m4/riddle/rooms/section3/room303.cpp
engines/m4/riddle/rooms/section3/room304.cpp
engines/m4/riddle/rooms/section3/room305.cpp
engines/m4/riddle/rooms/section3/room352.cpp
diff --git a/engines/m4/riddle/rooms/section2/room201.cpp b/engines/m4/riddle/rooms/section2/room201.cpp
index 6ba79a905d7..28220cdedd4 100644
--- a/engines/m4/riddle/rooms/section2/room201.cpp
+++ b/engines/m4/riddle/rooms/section2/room201.cpp
@@ -142,7 +142,7 @@ void Room201::init() {
}
} else {
player_set_commands_allowed(false);
- ws_demand_location(79, 257, 3);
+ ws_demand_location(_G(my_walker), 79, 257, 3);
if (_G(flags)[V053] == 2 && _G(game).previous_room != KERNEL_RESTORING_GAME) {
++_G(flags)[V006];
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index eba1e7e0a65..c09139e8cab 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -139,7 +139,7 @@ void Room203::init() {
case 202:
player_set_commands_allowed(false);
MoveScreenDelta(_G(game_buff_ptr), -300, 0);
- ws_demand_location(547, 316, 1);
+ ws_demand_location(_G(my_walker), 547, 316, 1);
setupGk();
setupOldLady();
@@ -181,7 +181,7 @@ void Room203::init() {
hotspot_set_active("PEASANT", false);
hotspot_set_active("SOLDIER'S HELMET", false);
kernel_timing_trigger(1, 130);
- ws_demand_location(348, 273, 1);
+ ws_demand_location(_G(my_walker), 348, 273, 1);
ws_walk(231, 331, nullptr, 303, 4);
break;
@@ -193,7 +193,7 @@ void Room203::init() {
setupPigeons();
if (_G(flags)[V067]) {
- ws_demand_location(1100, 290, 9);
+ ws_demand_location(_G(my_walker), 1100, 290, 9);
_G(player).disable_hyperwalk = true;
_peskyYellsThief = series_load("pesky yells thief");
@@ -236,7 +236,7 @@ void Room203::init() {
kernel_timing_trigger(1, 350);
} else {
- ws_demand_location(1055, 295, 7);
+ ws_demand_location(_G(my_walker), 1055, 295, 7);
ws_walk(1045, 345, nullptr, 303, 7);
kernel_timing_trigger(1, 300);
}
@@ -244,7 +244,7 @@ void Room203::init() {
default:
player_set_commands_allowed(false);
- ws_demand_location(-40, 352, 3);
+ ws_demand_location(_G(my_walker), -40, 352, 3);
if (keyCheck()) {
_G(kernel).call_daemon_every_loop = true;
@@ -510,7 +510,7 @@ void Room203::daemon() {
_ripYouSeeToIt = series_load("rip says you see to it");
_meiTalkToRip = series_load("mc talk to rip");
_meiTurnAndTalk = series_load("mc turn and talk");
- ws_demand_location(100, 360);
+ ws_demand_location(_G(my_walker), 100, 360);
kernel_timing_trigger(1, 29);
break;
@@ -2372,7 +2372,7 @@ void Room203::daemon() {
break;
case 363:
- ws_demand_location(1100, 290, 9);
+ ws_demand_location(_G(my_walker), 1100, 290, 9);
ws_walk(1060, 290, nullptr, 364, 7);
break;
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index 0157917a543..c1af472b1be 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -78,7 +78,7 @@ void Room301::init() {
_val12 = checkFlags(false);
player_set_commands_allowed(false);
- ws_demand_location(55, 270, 3);
+ ws_demand_location(_G(my_walker), 55, 270, 3);
if (_val12 || (!player_been_here(401) && _G(flags)[V092] && !_G(flags)[V093])) {
ws_walk(352, 269, nullptr, 60, 3);
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 554528cc5db..24952be3020 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -143,7 +143,7 @@ void Room303::init() {
playSeries(false);
_door = series_show_sprite("DOOR", 7, 0xf05);
- ws_demand_location(393, 260, 5);
+ ws_demand_location(_G(my_walker), 393, 260, 5);
ws_walk_load_walker_series(S3_NORMAL_DIRS, S3_NORMAL_NAMES);
ws_walk_load_shadow_series(S3_SHADOW_DIRS, S3_SHADOW_NAMES);
@@ -194,7 +194,7 @@ void Room303::init() {
case 305:
player_set_commands_allowed(false);
- ws_demand_location(28, 267, 3);
+ ws_demand_location(_G(my_walker), 28, 267, 3);
playSeries();
if (!player_been_here(301)) {
@@ -222,7 +222,7 @@ void Room303::init() {
case 309:
interface_show();
- ws_demand_location(230, 258, 10);
+ ws_demand_location(_G(my_walker), 230, 258, 10);
player_set_commands_allowed(false);
if (!player_been_here(301)) {
@@ -281,7 +281,7 @@ void Room303::init() {
_val12 = KT_PARSE;
kernel_load_variant("303lock1");
setFengActive(true);
- ws_demand_location(145, 289, 3);
+ ws_demand_location(_G(my_walker), 145, 289, 3);
setupMei();
setShadow4(true);
@@ -315,7 +315,7 @@ void Room303::daemon() {
case 5:
case 61:
- ws_demand_location(230, 258);
+ ws_demand_location(_G(my_walker), 230, 258);
player_set_commands_allowed(true);
break;
@@ -334,12 +334,12 @@ void Room303::daemon() {
break;
case 9:
- ws_demand_location(1350, 276, 9);
+ ws_demand_location(_G(my_walker), 1350, 276, 9);
ws_walk(1208, 276, nullptr, 75, 9);
break;
case 10:
- ws_demand_location(425, 227, 7);
+ ws_demand_location(_G(my_walker), 425, 227, 7);
ws_walk(399, 260, nullptr, 50, 7);
break;
@@ -1165,7 +1165,7 @@ void Room303::parser() {
case 1:
setShadow5(false);
if (player_said("giant matchstick"))
- ws_demand_location(610, 256);
+ ws_demand_location(_G(my_walker), 610, 256);
sendWSMessage_10000(_fengLi, 706, 256, 5, 2, 1);
break;
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 9fa30a0aec6..1137ee60b5f 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -58,7 +58,7 @@ void Room304::init() {
case 303:
player_set_commands_allowed(false);
- ws_demand_location(458, 263, 8);
+ ws_demand_location(_G(my_walker), 458, 263, 8);
if (_G(flags)[V084] == 2 || player_been_here(201)) {
_sword = series_show_sprite("one frame sword", 0, 0xa00);
@@ -83,7 +83,7 @@ void Room304::init() {
_useSword = _useHandlingStick = false;
_val4 = 0;
- ws_demand_location(452, 285, 9);
+ ws_demand_location(_G(my_walker), 452, 285, 9);
kernel_timing_trigger(1, 49);
_trunk = series_show_sprite("one frame trunk", 0, 0);
_stick = series_show_sprite("one frame stick", 0, 0xf00);
@@ -421,7 +421,7 @@ void Room304::intrMsg(frac16 myMessage, struct machine *sender) {
}
if (r->_useHandlingStick) {
- ws_demand_location(382, 295);
+ ws_demand_location(_G(my_walker), 382, 295);
ws_hide_walker();
player_set_commands_allowed(false);
terminateMachineAndNull(r->_machine2);
@@ -438,7 +438,7 @@ void Room304::intrMsg(frac16 myMessage, struct machine *sender) {
}
if ((myMessage >> 16) == 58 && r->_useSword) {
- ws_demand_location(382, 295);
+ ws_demand_location(_G(my_walker), 382, 295);
ws_hide_walker();
player_set_commands_allowed(false);
terminateMachineAndNull(r->_machine2);
@@ -492,8 +492,7 @@ void Room304::handlingStickAndSword() {
ws_unhide_walker();
player_update_info();
- ws_demand_location(_G(player_info).x - 28,
- _G(player_info).y + 9);
+ ws_demand_location(_G(my_walker), _G(player_info).x - 28, _G(player_info).y + 9);
ws_walk_load_walker_series(S3_NORMAL_DIRS2, S3_NORMAL_NAMES2);
ws_walk_load_shadow_series(S3_SHADOW_DIRS2, S3_SHADOW_NAMES2);
diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 6e9219cd796..3e899764b52 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -211,7 +211,7 @@ void Room305::init() {
player_set_commands_allowed(false);
if (player_been_here(301)) {
- ws_demand_location(1320, 296, 9);
+ ws_demand_location(_G(my_walker), 1320, 296, 9);
if (player_been_here(201)) {
_stander = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 494, 278, 73, 0xf00, true,
@@ -227,7 +227,7 @@ void Room305::init() {
MoveScreenDelta(game_buff_ptr, -640, 0);
kernel_timing_trigger(1, 10);
} else {
- ws_demand_location(1320, 296, 9);
+ ws_demand_location(_G(my_walker), 1320, 296, 9);
hotspot_set_active("FENG LI", false);
kernel_timing_trigger(1, 10);
MoveScreenDelta(game_buff_ptr, -640, 0);
@@ -236,7 +236,7 @@ void Room305::init() {
break;
default:
- ws_demand_location(1180, 320, 9);
+ ws_demand_location(_G(my_walker), 1180, 320, 9);
hotspot_set_active("FENG LI", false);
break;
}
diff --git a/engines/m4/riddle/rooms/section3/room352.cpp b/engines/m4/riddle/rooms/section3/room352.cpp
index 98d48c4789b..811d1baefb4 100644
--- a/engines/m4/riddle/rooms/section3/room352.cpp
+++ b/engines/m4/riddle/rooms/section3/room352.cpp
@@ -40,7 +40,7 @@ void Room352::init() {
AddSystemHotkey(KEY_ESCAPE, escapeKeyPressed);
_G(kernel).call_daemon_every_loop = true;
- ws_demand_location(584, 334, 3);
+ ws_demand_location(_G(my_walker), 584, 334, 3);
ws_hide_walker();
player_set_commands_allowed(false);
_val1 = 0;
More information about the Scummvm-git-logs
mailing list