[Scummvm-git-logs] scummvm master -> 97cf8588fa39577c27fd5dd0311f8d19e62a4d68
Strangerke
noreply at scummvm.org
Mon Feb 10 08:35:29 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:
97cf8588fa M4: RIDDLE: Fix calls to ws_demand_location in room group 6
Commit: 97cf8588fa39577c27fd5dd0311f8d19e62a4d68
https://github.com/scummvm/scummvm/commit/97cf8588fa39577c27fd5dd0311f8d19e62a4d68
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T09:35:20+01:00
Commit Message:
M4: RIDDLE: Fix calls to ws_demand_location in room group 6
Changed paths:
engines/m4/riddle/rooms/section6/room603.cpp
engines/m4/riddle/rooms/section6/room604.cpp
engines/m4/riddle/rooms/section6/room605.cpp
engines/m4/riddle/rooms/section6/room607.cpp
engines/m4/riddle/rooms/section6/room608.cpp
engines/m4/riddle/rooms/section6/room610.cpp
engines/m4/riddle/rooms/section6/room620.cpp
engines/m4/riddle/rooms/section6/room621.cpp
engines/m4/riddle/rooms/section6/room622.cpp
engines/m4/riddle/rooms/section6/room623.cpp
engines/m4/riddle/rooms/section6/room624.cpp
engines/m4/riddle/rooms/section6/room625.cpp
engines/m4/riddle/rooms/section6/room626.cpp
engines/m4/riddle/rooms/section6/room627.cpp
engines/m4/riddle/rooms/section6/room628.cpp
engines/m4/riddle/rooms/section6/room629.cpp
engines/m4/riddle/rooms/section6/room630.cpp
engines/m4/riddle/rooms/section6/room631.cpp
engines/m4/riddle/rooms/section6/room632.cpp
engines/m4/riddle/rooms/section6/room633.cpp
engines/m4/riddle/rooms/section6/room634.cpp
engines/m4/riddle/rooms/section6/room635.cpp
engines/m4/riddle/rooms/section6/room636.cpp
engines/m4/riddle/rooms/section6/room637.cpp
engines/m4/riddle/rooms/section6/room638.cpp
engines/m4/riddle/rooms/section6/room640.cpp
engines/m4/riddle/rooms/section6/room641.cpp
engines/m4/riddle/rooms/section6/room643.cpp
engines/m4/riddle/rooms/section6/room644.cpp
engines/m4/riddle/rooms/section6/room645.cpp
engines/m4/riddle/rooms/section6/room646.cpp
engines/m4/riddle/rooms/section6/room647.cpp
engines/m4/riddle/rooms/section6/room648.cpp
engines/m4/riddle/rooms/section6/room649.cpp
engines/m4/riddle/rooms/section6/room650.cpp
engines/m4/riddle/rooms/section6/room651.cpp
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index cbfadc1082f..a2716a66321 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -183,7 +183,7 @@ void Room603::init() {
case 604:
player_set_commands_allowed(false);
digi_preload("950_s28a");
- ws_demand_location(542, 230, 2);
+ ws_demand_location(_G(my_walker), 542, 230, 2);
ws_walk(534, 240, nullptr, 5, 7);
break;
@@ -197,14 +197,14 @@ void Room603::init() {
}
player_set_commands_allowed(false);
- ws_demand_location(670, 232, 2);
+ ws_demand_location(_G(my_walker), 670, 232, 2);
ws_walk(497, 245, nullptr, 1, 8);
break;
default:
player_set_commands_allowed(false);
digi_preload("950_s28a");
- ws_demand_location(67, 391, 2);
+ ws_demand_location(_G(my_walker), 67, 391, 2);
ws_walk(135, 356, nullptr, 1, 2);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index 4e6c845da60..f1f2c50dd0d 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -144,7 +144,7 @@ void Room604::init() {
case 603:
player_set_commands_allowed(false);
_shedDoor = series_play("SHED DOOR OPENS", 0xf00, 16, 50, 11);
- ws_demand_location(156, 338, 3);
+ ws_demand_location(_G(my_walker), 156, 338, 3);
digi_play("DOOROPEN", 2);
break;
@@ -152,14 +152,14 @@ void Room604::init() {
_shedDoor = series_show("SHED DOOR OPENS", 0xf00, 16);
if (_G(flags)[V203] == 8) {
- ws_demand_location(380, 304, 3);
+ ws_demand_location(_G(my_walker), 380, 304, 3);
ws_hide_walker();
series_load("rip crawls through window");
_ripley = series_play("RIP CRAWLS THROUGH WINDOW", 0x100, 2, 10, 6);
player_set_commands_allowed(false);
} else {
- ws_demand_location(381, 329, 10);
+ ws_demand_location(_G(my_walker), 381, 329, 10);
}
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room605.cpp b/engines/m4/riddle/rooms/section6/room605.cpp
index a3e9439627b..5b407eaf9f7 100644
--- a/engines/m4/riddle/rooms/section6/room605.cpp
+++ b/engines/m4/riddle/rooms/section6/room605.cpp
@@ -82,7 +82,7 @@ void Room605::init() {
if (_G(flags)[V203] == 2) {
player_set_commands_allowed(false);
_G(player).disable_hyperwalk = true;
- ws_demand_location(451, 368, 1);
+ ws_demand_location(_G(my_walker), 451, 368, 1);
ws_walk(513, 316, nullptr, -1, 10);
ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
@@ -92,7 +92,7 @@ void Room605::init() {
sendWSMessage_10000(_tt, 476, 290, 5, 10, 1);
} else {
- ws_demand_location(451, 353, 10);
+ ws_demand_location(_G(my_walker), 451, 353, 10);
}
break;
@@ -100,18 +100,18 @@ void Room605::init() {
digi_preload("950_s28");
digi_stop(3);
digi_unload("950_s28b");
- ws_demand_location(534, 219, 7);
+ ws_demand_location(_G(my_walker), 534, 219, 7);
ws_walk(520, 263, nullptr, -1, 7);
break;
case 623:
- ws_demand_location(-30, 272, 3);
+ ws_demand_location(_G(my_walker), -30, 272, 3);
ws_walk(34, 272, nullptr, 1, 3);
break;
default:
digi_preload("950_s28");
- ws_demand_location(451, 353, 10);
+ ws_demand_location(_G(my_walker), 451, 353, 10);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room607.cpp b/engines/m4/riddle/rooms/section6/room607.cpp
index bc833288513..4c54b00c9d8 100644
--- a/engines/m4/riddle/rooms/section6/room607.cpp
+++ b/engines/m4/riddle/rooms/section6/room607.cpp
@@ -68,28 +68,28 @@ void Room607::init() {
break;
case 633:
- ws_demand_location(316, 358, 1);
+ ws_demand_location(_G(my_walker), 316, 358, 1);
break;
case 638:
- ws_demand_location(-30, 334, 3);
+ ws_demand_location(_G(my_walker), -30, 334, 3);
ws_walk(32, 334, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 640:
- ws_demand_location(670, 288, 9);
+ ws_demand_location(_G(my_walker), 670, 288, 9);
ws_walk(604, 288, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 645:
- ws_demand_location(124, 308, 5);
+ ws_demand_location(_G(my_walker), 124, 308, 5);
break;
default:
digi_preload("950_s28C");
- ws_demand_location(316, 358, 1);
+ ws_demand_location(_G(my_walker), 316, 358, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index 2ab41d7f9d9..66db5fd7819 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -135,7 +135,7 @@ void Room608::init() {
player_set_commands_allowed(false);
_G(player).disable_hyperwalk = true;
- ws_demand_location(-30, 345, 1);
+ ws_demand_location(_G(my_walker), -30, 345, 1);
ws_walk(43, 345, nullptr, 18, 3);
ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
@@ -156,7 +156,7 @@ void Room608::init() {
player_set_commands_allowed(false);
_G(player).disable_hyperwalk = true;
- ws_demand_location(-30, 345, 1);
+ ws_demand_location(_G(my_walker), -30, 345, 1);
kernel_timing_trigger(1, 698);
ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
@@ -185,7 +185,7 @@ void Room608::init() {
if (_G(flags)[V203] != 2) {
player_set_commands_allowed(false);
- ws_demand_location(-30, 345, 3);
+ ws_demand_location(_G(my_walker), -30, 345, 3);
ws_walk(43, 345, nullptr, 1, 3);
}
break;
@@ -1008,7 +1008,7 @@ void Room608::daemon() {
_ripHandTalk3 = series_load("RIP TREK HAND TALK POS3");
_end2 = series_show("608END2", 0xe00, 16);
ws_unhide_walker();
- ws_demand_location(494, 276, 3);
+ ws_demand_location(_G(my_walker), 494, 276, 3);
sendWSMessage_10000(_G(my_walker), 524, 296, 9, 532, 1);
_ol = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, 0,
@@ -1265,7 +1265,7 @@ void Room608::daemon() {
case 747:
ws_unhide_walker();
- ws_demand_location(461, 293, 3);
+ ws_demand_location(_G(my_walker), 461, 293, 3);
sendWSMessage_10000(_G(my_walker), 432, 297, 3, 738, 1);
break;
diff --git a/engines/m4/riddle/rooms/section6/room610.cpp b/engines/m4/riddle/rooms/section6/room610.cpp
index c41f5340889..3ac7a338f94 100644
--- a/engines/m4/riddle/rooms/section6/room610.cpp
+++ b/engines/m4/riddle/rooms/section6/room610.cpp
@@ -81,7 +81,7 @@ void Room610::init() {
midi_play("tensions", 255, 1, -1, 949);
if (_flag1)
- ws_demand_location(615, 364, 10);
+ ws_demand_location(_G(my_walker), 615, 364, 10);
setup();
kernel_timing_trigger(300, 135);
@@ -92,7 +92,7 @@ void Room610::init() {
digi_preload("950_s28a");
setup();
kernel_timing_trigger(300, 135);
- ws_demand_location(472, 262, 3);
+ ws_demand_location(_G(my_walker), 472, 262, 3);
break;
default:
@@ -103,7 +103,7 @@ void Room610::init() {
if (player_been_here(610)) {
setup();
player_set_commands_allowed(false);
- ws_demand_location(665, 364, 9);
+ ws_demand_location(_G(my_walker), 665, 364, 9);
ws_walk(615, 364, nullptr, 1, 10);
} else {
sendWSMessage_10000(1, _k, _k00, 1, 50, -1, _k00, 50, 60, 4);
@@ -111,7 +111,7 @@ void Room610::init() {
_sgSlapsTt1, 1, 1, 4);
player_set_commands_allowed(false);
- ws_demand_location(665, 364, 9);
+ ws_demand_location(_G(my_walker), 665, 364, 9);
ws_walk(240, 272, nullptr, 10, 10);
kernel_timing_trigger(1, 100);
}
@@ -134,7 +134,7 @@ void Room610::daemon() {
case 10:
_pu01 = series_stream("610pu01", 5, 0, 103);
series_stream_break_on_frame(_pu01, 6, 102);
- ws_demand_location(272, 273, 7);
+ ws_demand_location(_G(my_walker), 272, 273, 7);
ws_hide_walker();
_ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
diff --git a/engines/m4/riddle/rooms/section6/room620.cpp b/engines/m4/riddle/rooms/section6/room620.cpp
index 45db29fba5f..296a7e907ca 100644
--- a/engines/m4/riddle/rooms/section6/room620.cpp
+++ b/engines/m4/riddle/rooms/section6/room620.cpp
@@ -34,18 +34,18 @@ void Room620::init() {
break;
case 621:
- ws_demand_location(670, 322, 9);
+ ws_demand_location(_G(my_walker), 670, 322, 9);
ws_walk(605, 322, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 626:
- ws_demand_location(418, 285, 5);
+ ws_demand_location(_G(my_walker), 418, 285, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(418, 285, 5);
+ ws_demand_location(_G(my_walker), 418, 285, 5);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room621.cpp b/engines/m4/riddle/rooms/section6/room621.cpp
index f5dacbfef3b..7fd0f10d7cb 100644
--- a/engines/m4/riddle/rooms/section6/room621.cpp
+++ b/engines/m4/riddle/rooms/section6/room621.cpp
@@ -34,24 +34,24 @@ void Room621::init() {
break;
case 620:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 622:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 627:
- ws_demand_location(384, 293, 5);
+ ws_demand_location(_G(my_walker), 384, 293, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(384, 293, 5);
+ ws_demand_location(_G(my_walker), 384, 293, 5);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room622.cpp b/engines/m4/riddle/rooms/section6/room622.cpp
index 5618c904884..b9b2d6bc39d 100644
--- a/engines/m4/riddle/rooms/section6/room622.cpp
+++ b/engines/m4/riddle/rooms/section6/room622.cpp
@@ -34,24 +34,24 @@ void Room622::init() {
break;
case 621:
- ws_demand_location(-30, 362, 3);
+ ws_demand_location(_G(my_walker), -30, 362, 3);
ws_walk(30, 362, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 623:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 628:
- ws_demand_location(313, 290, 5);
+ ws_demand_location(_G(my_walker), 313, 290, 5);
break;
default:
digi_preload("650_s28c");
- ws_demand_location(313, 290, 5);
+ ws_demand_location(_G(my_walker), 313, 290, 5);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room623.cpp b/engines/m4/riddle/rooms/section6/room623.cpp
index b746b606e9c..e63300a3c34 100644
--- a/engines/m4/riddle/rooms/section6/room623.cpp
+++ b/engines/m4/riddle/rooms/section6/room623.cpp
@@ -37,28 +37,28 @@ void Room623::init() {
digi_preload("950_s28c");
digi_stop(3);
digi_unload("950_s28");
- ws_demand_location(303, 352, 1);
+ ws_demand_location(_G(my_walker), 303, 352, 1);
break;
case 622:
- ws_demand_location(-30, 362, 3);
+ ws_demand_location(_G(my_walker), -30, 362, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 624:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 629:
- ws_demand_location(381, 283, 5);
+ ws_demand_location(_G(my_walker), 381, 283, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(313, 283, 5);
+ ws_demand_location(_G(my_walker), 313, 283, 5);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room624.cpp b/engines/m4/riddle/rooms/section6/room624.cpp
index de56b146444..f17dfb9f0a5 100644
--- a/engines/m4/riddle/rooms/section6/room624.cpp
+++ b/engines/m4/riddle/rooms/section6/room624.cpp
@@ -34,24 +34,24 @@ void Room624::init() {
break;
case 623:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 625:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 630:
- ws_demand_location(367, 296, 5);
+ ws_demand_location(_G(my_walker), 367, 296, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(367, 296, 5);
+ ws_demand_location(_G(my_walker), 367, 296, 5);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room625.cpp b/engines/m4/riddle/rooms/section6/room625.cpp
index 65641944b66..0debf7ca6be 100644
--- a/engines/m4/riddle/rooms/section6/room625.cpp
+++ b/engines/m4/riddle/rooms/section6/room625.cpp
@@ -35,14 +35,14 @@ void Room625::init() {
break;
case 624:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_28c");
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room626.cpp b/engines/m4/riddle/rooms/section6/room626.cpp
index f035e3523e5..b5b5fb75ad1 100644
--- a/engines/m4/riddle/rooms/section6/room626.cpp
+++ b/engines/m4/riddle/rooms/section6/room626.cpp
@@ -35,22 +35,22 @@ void Room626::init() {
break;
case 620:
- ws_demand_location(340, 500, 1);
+ ws_demand_location(_G(my_walker), 340, 500, 1);
break;
case 627:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 631:
- ws_demand_location(341, 290, 5);
+ ws_demand_location(_G(my_walker), 341, 290, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(340, 500, 1);
+ ws_demand_location(_G(my_walker), 340, 500, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room627.cpp b/engines/m4/riddle/rooms/section6/room627.cpp
index 2f1d84df7fe..52bedce4da5 100644
--- a/engines/m4/riddle/rooms/section6/room627.cpp
+++ b/engines/m4/riddle/rooms/section6/room627.cpp
@@ -34,28 +34,28 @@ void Room627::init() {
break;
case 621:
- ws_demand_location(429, 337, 1);
+ ws_demand_location(_G(my_walker), 429, 337, 1);
break;
case 626:
- ws_demand_location(-30, 328, 3);
+ ws_demand_location(_G(my_walker), -30, 328, 3);
ws_walk(30, 328, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 628:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 632:
- ws_demand_location(426, 283, 5);
+ ws_demand_location(_G(my_walker), 426, 283, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(429, 337, 1);
+ ws_demand_location(_G(my_walker), 429, 337, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room628.cpp b/engines/m4/riddle/rooms/section6/room628.cpp
index a9b180f81b9..27465fe1b9e 100644
--- a/engines/m4/riddle/rooms/section6/room628.cpp
+++ b/engines/m4/riddle/rooms/section6/room628.cpp
@@ -34,28 +34,28 @@ void Room628::init() {
break;
case 622:
- ws_demand_location(341, 344, 1);
+ ws_demand_location(_G(my_walker), 341, 344, 1);
break;
case 627:
- ws_demand_location(-30, 292, 3);
+ ws_demand_location(_G(my_walker), -30, 292, 3);
ws_walk(30, 292, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 629:
- ws_demand_location(670, 330, 9);
+ ws_demand_location(_G(my_walker), 670, 330, 9);
ws_walk(605, 330, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 633:
- ws_demand_location(199, 277, 5);
+ ws_demand_location(_G(my_walker), 199, 277, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(341, 344, 1);
+ ws_demand_location(_G(my_walker), 341, 344, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room629.cpp b/engines/m4/riddle/rooms/section6/room629.cpp
index 2e2bf6bd5f4..5b65c83507a 100644
--- a/engines/m4/riddle/rooms/section6/room629.cpp
+++ b/engines/m4/riddle/rooms/section6/room629.cpp
@@ -34,28 +34,28 @@ void Room629::init() {
break;
case 623:
- ws_demand_location(299, 339, 1);
+ ws_demand_location(_G(my_walker), 299, 339, 1);
break;
case 628:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 630:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 634:
- ws_demand_location(404, 273, 5);
+ ws_demand_location(_G(my_walker), 404, 273, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(299, 339, 1);
+ ws_demand_location(_G(my_walker), 299, 339, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room630.cpp b/engines/m4/riddle/rooms/section6/room630.cpp
index 061a1b1ba29..8ff4a8eaa1a 100644
--- a/engines/m4/riddle/rooms/section6/room630.cpp
+++ b/engines/m4/riddle/rooms/section6/room630.cpp
@@ -34,22 +34,22 @@ void Room630::init() {
break;
case 624:
- ws_demand_location(382, 326, 1);
+ ws_demand_location(_G(my_walker), 382, 326, 1);
break;
case 629:
- ws_demand_location(-30, 333, 3);
+ ws_demand_location(_G(my_walker), -30, 333, 3);
ws_walk(30, 333, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 635:
- ws_demand_location(410, 276, 5);
+ ws_demand_location(_G(my_walker), 410, 276, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(382, 326, 1);
+ ws_demand_location(_G(my_walker), 382, 326, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room631.cpp b/engines/m4/riddle/rooms/section6/room631.cpp
index 324abddf1a8..b5366e900b2 100644
--- a/engines/m4/riddle/rooms/section6/room631.cpp
+++ b/engines/m4/riddle/rooms/section6/room631.cpp
@@ -34,22 +34,22 @@ void Room631::init() {
break;
case 626:
- ws_demand_location(255, 341, 1);
+ ws_demand_location(_G(my_walker), 255, 341, 1);
break;
case 632:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 637:
- ws_demand_location(403, 271, 5);
+ ws_demand_location(_G(my_walker), 403, 271, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(255, 341, 1);
+ ws_demand_location(_G(my_walker), 255, 341, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room632.cpp b/engines/m4/riddle/rooms/section6/room632.cpp
index 4e5f8209570..c0f4fc33078 100644
--- a/engines/m4/riddle/rooms/section6/room632.cpp
+++ b/engines/m4/riddle/rooms/section6/room632.cpp
@@ -34,28 +34,28 @@ void Room632::init() {
break;
case 627:
- ws_demand_location(248, 343, 1);
+ ws_demand_location(_G(my_walker), 248, 343, 1);
break;
case 631:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 633:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 638:
- ws_demand_location(230, 291, 5);
+ ws_demand_location(_G(my_walker), 230, 291, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(248, 343, 1);
+ ws_demand_location(_G(my_walker), 248, 343, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room633.cpp b/engines/m4/riddle/rooms/section6/room633.cpp
index c9112fe1827..efe1e25d264 100644
--- a/engines/m4/riddle/rooms/section6/room633.cpp
+++ b/engines/m4/riddle/rooms/section6/room633.cpp
@@ -34,28 +34,28 @@ void Room633::init() {
break;
case 607:
- ws_demand_location(259, 277, 5);
+ ws_demand_location(_G(my_walker), 259, 277, 5);
break;
case 628:
- ws_demand_location(200, 345, 1);
+ ws_demand_location(_G(my_walker), 200, 345, 1);
break;
case 632:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 634:
- ws_demand_location(670, 290, 9);
+ ws_demand_location(_G(my_walker), 670, 290, 9);
ws_walk(605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(200, 345, 1);
+ ws_demand_location(_G(my_walker), 200, 345, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room634.cpp b/engines/m4/riddle/rooms/section6/room634.cpp
index d0302ae26ae..12bdb488ca1 100644
--- a/engines/m4/riddle/rooms/section6/room634.cpp
+++ b/engines/m4/riddle/rooms/section6/room634.cpp
@@ -34,28 +34,28 @@ void Room634::init() {
break;
case 629:
- ws_demand_location(372, 342, 1);
+ ws_demand_location(_G(my_walker), 372, 342, 1);
break;
case 633:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 635:
- ws_demand_location(670, 310, 9);
+ ws_demand_location(_G(my_walker), 670, 310, 9);
ws_walk(605, 310, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 640:
- ws_demand_location(365, 267, 5);
+ ws_demand_location(_G(my_walker), 365, 267, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(372, 342, 1);
+ ws_demand_location(_G(my_walker), 372, 342, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room635.cpp b/engines/m4/riddle/rooms/section6/room635.cpp
index aae59a61390..70e6486f721 100644
--- a/engines/m4/riddle/rooms/section6/room635.cpp
+++ b/engines/m4/riddle/rooms/section6/room635.cpp
@@ -34,28 +34,28 @@ void Room635::init() {
break;
case 630:
- ws_demand_location(308, 340, 1);
+ ws_demand_location(_G(my_walker), 308, 340, 1);
break;
case 634:
- ws_demand_location(-30, 321, 3);
+ ws_demand_location(_G(my_walker), -30, 321, 3);
ws_walk(30, 321, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 636:
- ws_demand_location(670, 316, 9);
+ ws_demand_location(_G(my_walker), 670, 316, 9);
ws_walk(605, 316, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 641:
- ws_demand_location(90, 250, 5);
+ ws_demand_location(_G(my_walker), 90, 250, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(308, 340, 1);
+ ws_demand_location(_G(my_walker), 308, 340, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room636.cpp b/engines/m4/riddle/rooms/section6/room636.cpp
index 5f15e03ffdd..31211c10c4a 100644
--- a/engines/m4/riddle/rooms/section6/room636.cpp
+++ b/engines/m4/riddle/rooms/section6/room636.cpp
@@ -34,18 +34,18 @@ void Room636::init() {
break;
case 635:
- ws_demand_location(-30, 346, 3);
+ ws_demand_location(_G(my_walker), -30, 346, 3);
ws_walk(30, 346, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 642:
- ws_demand_location(268, 234, 5);
+ ws_demand_location(_G(my_walker), 268, 234, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(268, 234, 5);
+ ws_demand_location(_G(my_walker), 268, 234, 5);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room637.cpp b/engines/m4/riddle/rooms/section6/room637.cpp
index ae1217fdc38..bca8ec75c86 100644
--- a/engines/m4/riddle/rooms/section6/room637.cpp
+++ b/engines/m4/riddle/rooms/section6/room637.cpp
@@ -34,22 +34,22 @@ void Room637::init() {
break;
case 631:
- ws_demand_location(298, 352, 1);
+ ws_demand_location(_G(my_walker), 298, 352, 1);
break;
case 638:
- ws_demand_location(670, 336, 9);
+ ws_demand_location(_G(my_walker), 670, 336, 9);
ws_walk(621, 336, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 643:
- ws_demand_location(300, 290, 5);
+ ws_demand_location(_G(my_walker), 300, 290, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(298, 352, 1);
+ ws_demand_location(_G(my_walker), 298, 352, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room638.cpp b/engines/m4/riddle/rooms/section6/room638.cpp
index 017654f027f..5fd2a31070c 100644
--- a/engines/m4/riddle/rooms/section6/room638.cpp
+++ b/engines/m4/riddle/rooms/section6/room638.cpp
@@ -34,28 +34,28 @@ void Room638::init() {
break;
case 607:
- ws_demand_location(670, 300, 9);
+ ws_demand_location(_G(my_walker), 670, 300, 9);
ws_walk(615, 300, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 632:
- ws_demand_location(360, 3550, 11);
+ ws_demand_location(_G(my_walker), 360, 3550, 11);
break;
case 637:
- ws_demand_location(-30, 319, 3);
+ ws_demand_location(_G(my_walker), -30, 319, 3);
ws_walk(20, 319, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 644:
- ws_demand_location(360, 300, 5);
+ ws_demand_location(_G(my_walker), 360, 300, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(360, 3550, 11);
+ ws_demand_location(_G(my_walker), 360, 3550, 11);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room640.cpp b/engines/m4/riddle/rooms/section6/room640.cpp
index d2f847b5e1a..5c6431afca9 100644
--- a/engines/m4/riddle/rooms/section6/room640.cpp
+++ b/engines/m4/riddle/rooms/section6/room640.cpp
@@ -34,28 +34,28 @@ void Room640::init() {
break;
case 607:
- ws_demand_location(-30, 295, 3);
+ ws_demand_location(_G(my_walker), -30, 295, 3);
ws_walk(32, 295, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 634:
- ws_demand_location(303, 347, 1);
+ ws_demand_location(_G(my_walker), 303, 347, 1);
break;
case 641:
- ws_demand_location(670, 335, 9);
+ ws_demand_location(_G(my_walker), 670, 335, 9);
ws_walk(591, 335, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 646:
- ws_demand_location(290, 277, 5);
+ ws_demand_location(_G(my_walker), 290, 277, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(303, 347, 1);
+ ws_demand_location(_G(my_walker), 303, 347, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room641.cpp b/engines/m4/riddle/rooms/section6/room641.cpp
index 130024dac30..f2413e6e46d 100644
--- a/engines/m4/riddle/rooms/section6/room641.cpp
+++ b/engines/m4/riddle/rooms/section6/room641.cpp
@@ -34,28 +34,28 @@ void Room641::init() {
break;
case 635:
- ws_demand_location(305, 342, 1);
+ ws_demand_location(_G(my_walker), 305, 342, 1);
break;
case 640:
- ws_demand_location(-30, 326, 3);
+ ws_demand_location(_G(my_walker), -30, 326, 3);
ws_walk(24, 326, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 642:
- ws_demand_location(670, 319, 9);
+ ws_demand_location(_G(my_walker), 670, 319, 9);
ws_walk(614, 319, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 647:
- ws_demand_location(315, 282, 5);
+ ws_demand_location(_G(my_walker), 315, 282, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(305, 342, 1);
+ ws_demand_location(_G(my_walker), 305, 342, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room643.cpp b/engines/m4/riddle/rooms/section6/room643.cpp
index 8c6095f9d9a..3ca757a4362 100644
--- a/engines/m4/riddle/rooms/section6/room643.cpp
+++ b/engines/m4/riddle/rooms/section6/room643.cpp
@@ -34,22 +34,22 @@ void Room643::init() {
break;
case 637:
- ws_demand_location(337, 347, 11);
+ ws_demand_location(_G(my_walker), 337, 347, 11);
break;
case 644:
- ws_demand_location(670, 301, 9);
+ ws_demand_location(_G(my_walker), 670, 301, 9);
ws_walk(615, 301, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 649:
- ws_demand_location(298, 296, 5);
+ ws_demand_location(_G(my_walker), 298, 296, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(337, 347, 11);
+ ws_demand_location(_G(my_walker), 337, 347, 11);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room644.cpp b/engines/m4/riddle/rooms/section6/room644.cpp
index 210fac73004..ab14a3796cc 100644
--- a/engines/m4/riddle/rooms/section6/room644.cpp
+++ b/engines/m4/riddle/rooms/section6/room644.cpp
@@ -35,24 +35,24 @@ void Room644::init() {
break;
case 638:
- ws_demand_location(343, 351, 1);
+ ws_demand_location(_G(my_walker), 343, 351, 1);
break;
case 643:
- ws_demand_location(-30, 313, 3);
+ ws_demand_location(_G(my_walker), -30, 313, 3);
ws_walk(25, 313, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 645:
- ws_demand_location(670, 346, 9);
+ ws_demand_location(_G(my_walker), 670, 346, 9);
ws_walk(613, 346, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(343, 351, 1);
+ ws_demand_location(_G(my_walker), 343, 351, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room645.cpp b/engines/m4/riddle/rooms/section6/room645.cpp
index 0696fd70c91..c27540601f5 100644
--- a/engines/m4/riddle/rooms/section6/room645.cpp
+++ b/engines/m4/riddle/rooms/section6/room645.cpp
@@ -34,24 +34,24 @@ void Room645::init() {
break;
case 607:
- ws_demand_location(313, 348, 1);
+ ws_demand_location(_G(my_walker), 313, 348, 1);
break;
case 644:
- ws_demand_location(-30, 323, 3);
+ ws_demand_location(_G(my_walker), -30, 323, 3);
ws_walk(25, 323, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 646:
- ws_demand_location(670, 298, 3);
+ ws_demand_location(_G(my_walker), 670, 298, 3);
ws_walk(608, 298, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(313, 348, 1);
+ ws_demand_location(_G(my_walker), 313, 348, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room646.cpp b/engines/m4/riddle/rooms/section6/room646.cpp
index 27feeb9f185..041bf1218ee 100644
--- a/engines/m4/riddle/rooms/section6/room646.cpp
+++ b/engines/m4/riddle/rooms/section6/room646.cpp
@@ -34,28 +34,28 @@ void Room646::init() {
break;
case 640:
- ws_demand_location(320, 353, 11);
+ ws_demand_location(_G(my_walker), 320, 353, 11);
break;
case 645:
- ws_demand_location(-30, 330, 9);
+ ws_demand_location(_G(my_walker), -30, 330, 9);
ws_walk(30, 330, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 647:
- ws_demand_location(670, 292, 9);
+ ws_demand_location(_G(my_walker), 670, 292, 9);
ws_walk(610, 292, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 650:
- ws_demand_location(262, 274, 5);
+ ws_demand_location(_G(my_walker), 262, 274, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(320, 353, 11);
+ ws_demand_location(_G(my_walker), 320, 353, 11);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room647.cpp b/engines/m4/riddle/rooms/section6/room647.cpp
index 30775bf582f..a08ea8923a4 100644
--- a/engines/m4/riddle/rooms/section6/room647.cpp
+++ b/engines/m4/riddle/rooms/section6/room647.cpp
@@ -34,28 +34,28 @@ void Room647::init() {
break;
case 641:
- ws_demand_location(320, 353, 1);
+ ws_demand_location(_G(my_walker), 320, 353, 1);
break;
case 646:
- ws_demand_location(-30, 330, 3);
+ ws_demand_location(_G(my_walker), -30, 330, 3);
ws_walk(30, 330, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 648:
- ws_demand_location(670, 307, 9);
+ ws_demand_location(_G(my_walker), 670, 307, 9);
ws_walk(610, 307, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 651:
- ws_demand_location(0, 292, 5);
+ ws_demand_location(_G(my_walker), 0, 292, 5);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(320, 353, 1);
+ ws_demand_location(_G(my_walker), 320, 353, 1);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room648.cpp b/engines/m4/riddle/rooms/section6/room648.cpp
index 465961ad1c3..3ea57f2c4b3 100644
--- a/engines/m4/riddle/rooms/section6/room648.cpp
+++ b/engines/m4/riddle/rooms/section6/room648.cpp
@@ -34,18 +34,18 @@ void Room648::init() {
break;
case 642:
- ws_demand_location(320, 346, 11);
+ ws_demand_location(_G(my_walker), 320, 346, 11);
break;
case 647:
- ws_demand_location(-30, 306, 3);
+ ws_demand_location(_G(my_walker), -30, 306, 3);
ws_walk(30, 306, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(320, 346, 11);
+ ws_demand_location(_G(my_walker), 320, 346, 11);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room649.cpp b/engines/m4/riddle/rooms/section6/room649.cpp
index ce08cbf0c4d..af51b9e79f2 100644
--- a/engines/m4/riddle/rooms/section6/room649.cpp
+++ b/engines/m4/riddle/rooms/section6/room649.cpp
@@ -34,12 +34,12 @@ void Room649::init() {
break;
case 643:
- ws_demand_location(334, 347, 11);
+ ws_demand_location(_G(my_walker), 334, 347, 11);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(334, 347, 11);
+ ws_demand_location(_G(my_walker), 334, 347, 11);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room650.cpp b/engines/m4/riddle/rooms/section6/room650.cpp
index 828e823d6e6..ba292388d96 100644
--- a/engines/m4/riddle/rooms/section6/room650.cpp
+++ b/engines/m4/riddle/rooms/section6/room650.cpp
@@ -34,18 +34,18 @@ void Room650::init() {
break;
case 646:
- ws_demand_location(320, 350, 11);
+ ws_demand_location(_G(my_walker), 320, 350, 11);
break;
case 651:
- ws_demand_location(670, 304, 9);
+ ws_demand_location(_G(my_walker), 670, 304, 9);
ws_walk(615, 304, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(320, 350, 11);
+ ws_demand_location(_G(my_walker), 320, 350, 11);
break;
}
diff --git a/engines/m4/riddle/rooms/section6/room651.cpp b/engines/m4/riddle/rooms/section6/room651.cpp
index a6e91f58422..7cf5cfcb23e 100644
--- a/engines/m4/riddle/rooms/section6/room651.cpp
+++ b/engines/m4/riddle/rooms/section6/room651.cpp
@@ -36,20 +36,20 @@ void Room651::init() {
case 647:
if (_G(flags)[V206])
- ws_demand_location(548, 372, 11);
+ ws_demand_location(_G(my_walker), 548, 372, 11);
else
- ws_demand_location(277, 353, 11);
+ ws_demand_location(_G(my_walker), 277, 353, 11);
break;
case 650:
- ws_demand_location(-30, 310, 3);
+ ws_demand_location(_G(my_walker), -30, 310, 3);
ws_walk(20, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_s28c");
- ws_demand_location(277, 353, 11);
+ ws_demand_location(_G(my_walker), 277, 353, 11);
break;
}
More information about the Scummvm-git-logs
mailing list