[Scummvm-git-logs] scummvm master -> 0d16430fd70062a3b4b859ab9d9978dc7c95a7fc
Strangerke
noreply at scummvm.org
Wed Feb 12 06:50: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:
0d16430fd7 M4: RIDDLE: Fix calls to ws_walk in room group 5 (WIP) and 6
Commit: 0d16430fd70062a3b4b859ab9d9978dc7c95a7fc
https://github.com/scummvm/scummvm/commit/0d16430fd70062a3b4b859ab9d9978dc7c95a7fc
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-12T07:49:05+01:00
Commit Message:
M4: RIDDLE: Fix calls to ws_walk in room group 5 (WIP) and 6
Changed paths:
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/room603.cpp
diff --git a/engines/m4/riddle/rooms/section5/room504.cpp b/engines/m4/riddle/rooms/section5/room504.cpp
index f8ab16685a0..ec156010116 100644
--- a/engines/m4/riddle/rooms/section5/room504.cpp
+++ b/engines/m4/riddle/rooms/section5/room504.cpp
@@ -2614,7 +2614,7 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V154] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(491, 166, nullptr, 586, 11);
+ ws_walk(_G(my_walker), 491, 166, nullptr, 586, 11);
} else if (takeFlag && player_said_any("ROPE ") &&
_G(flags)[V154] == 4 && _isOnRight) {
player_set_commands_allowed(false);
@@ -2627,7 +2627,7 @@ void Room504::parser() {
_vineThrowType = 2;
_G(flags)[V152] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(491, 166, nullptr, 586, 11);
+ ws_walk(_G(my_walker), 491, 166, nullptr, 586, 11);
} else if (takeFlag && player_said("GREEN VINE ") &&
_G(flags)[V152] == 4 && _isOnRight) {
player_set_commands_allowed(false);
@@ -2641,7 +2641,7 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V153] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(491, 166, nullptr, 586, 11);
+ ws_walk(_G(my_walker), 491, 166, nullptr, 586, 11);
} else if (takeFlag && player_said("BROWN VINE ") &&
_G(flags)[V153] == 4 && _isOnRight) {
player_set_commands_allowed(false);
@@ -2655,7 +2655,7 @@ void Room504::parser() {
_vineThrowType = 4;
_G(flags)[V171] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(491, 166, nullptr, 586, 11);
+ ws_walk(_G(my_walker), 491, 166, nullptr, 586, 11);
} else if (takeFlag && player_said("VINES ") &&
_G(flags)[V171] == 4 && _isOnRight) {
player_set_commands_allowed(false);
@@ -2681,71 +2681,71 @@ void Room504::parser() {
player_set_commands_allowed(false);
_vineThrowType = 1;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(528, 168, nullptr, 595, 8);
+ ws_walk(_G(my_walker), 528, 168, nullptr, 595, 8);
} else if (_isOnRight && _G(player).click_x <= 300 &&
player_said("GREEN VINE COIL ") && _G(flags)[V152] == 1) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(528, 168, nullptr, 595, 8);
+ ws_walk(_G(my_walker), 528, 168, nullptr, 595, 8);
} else if (_isOnRight && _G(player).click_x <= 300 &&
player_said("BROWN VINE COIL ") && _G(flags)[V153] == 1) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(528, 168, nullptr, 595, 8);
+ ws_walk(_G(my_walker), 528, 168, nullptr, 595, 8);
} else if (_isOnRight && _G(player).click_x <= 300 &&
player_said("COIL OF VINES ") && _G(flags)[V171] == 1) {
player_set_commands_allowed(false);
_vineThrowType = 4;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(528, 168, nullptr, 595, 8);
+ ws_walk(_G(my_walker), 528, 168, nullptr, 595, 8);
} else if (!_isOnRight && player_said("TREE", "ROPE COIL ")) {
player_set_commands_allowed(false);
_vineThrowType = 1;
_G(flags)[V154] = 2;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 611, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 611, 11);
} else if (!_isOnRight && player_said("TREE", "GREEN VINE COIL ")) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(flags)[V152] = 2;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 611, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 611, 11);
} else if (!_isOnRight && player_said("TREE", "COIL OF VINES ")) {
player_set_commands_allowed(false);
_vineThrowType = 4;
_G(flags)[V171] = 2;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 611, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 611, 11);
} else if (!_isOnRight && player_said("TREE", "BROWN VINE COIL ")) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(flags)[V153] = 2;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 611, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 611, 11);
} else if (!_isOnRight && _G(player).click_x > 300 && player_said("ROPE COIL ")) {
player_set_commands_allowed(false);
_vineThrowType = 1;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(200, 153, nullptr, 620, 3);
+ ws_walk(_G(my_walker), 200, 153, nullptr, 620, 3);
} else if (!_isOnRight && _G(player).click_x > 300 && player_said("GREEN VINE COIL ")) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(200, 153, nullptr, 620, 3);
+ ws_walk(_G(my_walker), 200, 153, nullptr, 620, 3);
} else if (!_isOnRight && _G(player).click_x > 300 && player_said("BROWN VINE COIL ")) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(200, 153, nullptr, 620, 3);
+ ws_walk(_G(my_walker), 200, 153, nullptr, 620, 3);
} else if (!_isOnRight && _G(player).click_x > 300 && player_said("COIL OF VINES ")) {
player_set_commands_allowed(false);
_vineThrowType = 4;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(200, 153, nullptr, 620, 3);
+ ws_walk(_G(my_walker), 200, 153, nullptr, 620, 3);
} else if (player_said("TREE") && player_said("ROPE") &&
!_isOnRight && inv_player_has("ROPE")) {
@@ -2753,28 +2753,28 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V154] = 0;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 630, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 630, 11);
} else if (player_said("TREE") && player_said("GREEN VINE") &&
!_isOnRight && inv_player_has("GREEN VINE")) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(flags)[V152] = 0;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 630, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 630, 11);
} else if (player_said("TREE") && player_said("VINES") &&
!_isOnRight && inv_player_has("VINES")) {
player_set_commands_allowed(false);
_vineThrowType = 4;
_G(flags)[V171] = 0;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 630, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 630, 11);
} else if (player_said("TREE") && player_said("BROWN VINE") &&
!_isOnRight && inv_player_has("BROWN VINE")) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(flags)[V153] = 0;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 630, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 630, 11);
} else if (_isOnRight && vineStatueFlag && player_said("ROPE COIL ")) {
player_set_commands_allowed(false);
@@ -2807,14 +2807,14 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V154] = 5;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(485, 166, nullptr, 675, 11);
+ ws_walk(_G(my_walker), 485, 166, nullptr, 675, 11);
} else if (useFlag && player_said_any("GREEN VINE ", "GREEN VINE ") &&
_G(flags)[V152] == 2 && _isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(flags)[V152] = 5;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(485, 166, nullptr, 675, 11);
+ ws_walk(_G(my_walker), 485, 166, nullptr, 675, 11);
} else if (useFlag && player_said_any("BROWN VINE ", "BROWN VINE ") &&
_G(flags)[V153] == 2 && _isOnRight) {
player_set_commands_allowed(false);
@@ -2828,7 +2828,7 @@ void Room504::parser() {
_vineThrowType = 4;
_G(flags)[V171] = 5;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(485, 166, nullptr, 675, 11);
+ ws_walk(_G(my_walker), 485, 166, nullptr, 675, 11);
} else if (useFlag && player_said_any("ROPE ", "ROPE ") &&
_G(flags)[V154] == 2 && !_isOnRight) {
@@ -2836,28 +2836,28 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V154] = 4;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 684, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 684, 11);
} else if (useFlag && player_said_any("GREEN VINE ", "GREEN VINE ") &&
_G(flags)[V152] == 2 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(flags)[V152] = 4;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 684, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 684, 11);
} else if (useFlag && player_said_any("BROWN VINE ", "BROWN VINE ") &&
_G(flags)[V154] == 2 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(flags)[V153] = 4;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 684, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 684, 11);
} else if (useFlag && player_said("VINES ") &&
_G(flags)[V171] == 2 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 1;
_G(flags)[V171] = 4;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 684, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 684, 11);
} else if (takeFlag && player_said("ROPE ") &&
_G(flags)[V154] == 0 && !_isOnRight) {
@@ -2865,28 +2865,28 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V154] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 693, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 693, 11);
} else if (takeFlag && player_said_any("GREEN VINE ", "GREEN VINE COIL ") &&
_G(flags)[V152] == 0 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(flags)[V152] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 693, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 693, 11);
} else if (takeFlag && player_said_any("BROWN VINE ", "BROWN VINE COIL ") &&
_G(flags)[V153] == 0 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(flags)[V153] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 693, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 693, 11);
} else if (takeFlag && player_said_any("VINES ", "COIL OF VINES ") &&
_G(flags)[V171] == 0 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 4;
_G(flags)[V171] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 693, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 693, 11);
} else if (takeFlag && player_said("ROPE ") &&
_G(flags)[V154] == 5 && !_isOnRight) {
@@ -2894,28 +2894,28 @@ void Room504::parser() {
_vineThrowType = 1;
_G(flags)[V154] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 700, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 700, 11);
} else if (takeFlag && player_said_any("GREEN VINE ", "GREEN VINE COIL ") &&
_G(flags)[V153] == 5 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 3;
_G(flags)[V153] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 700, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 700, 11);
} else if (takeFlag && player_said_any("BROWN VINE ", "BROWN VINE COIL ") &&
_G(flags)[V152] == 5 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 2;
_G(flags)[V152] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 700, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 700, 11);
} else if (takeFlag && player_said_any("VINES ", "COIL OF VINES ") &&
_G(flags)[V171] == 5 && !_isOnRight) {
player_set_commands_allowed(false);
_vineThrowType = 4;
_G(flags)[V171] = 3;
_G(kernel).trigger_mode = KT_DAEMON;
- ws_walk(135, 146, nullptr, 700, 11);
+ ws_walk(_G(my_walker), 135, 146, nullptr, 700, 11);
} else if (takeFlag && _isOnRight && player_said_any("ROPE ", "ROPE COIL ") &&
_G(flags)[V154] == 5) {
@@ -3556,9 +3556,9 @@ bool Room504::parser1() {
if (inv_player_has("DRIFTWOOD STUMP") || inv_player_has("POLE")) {
kernel_timing_trigger(1, 707);
} else if (!_flag2) {
- ws_walk(200, 153, nullptr, 714, 3);
+ ws_walk(_G(my_walker), 200, 153, nullptr, 714, 3);
} else {
- ws_walk(200, 153, nullptr, 570, 3);
+ ws_walk(_G(my_walker), 200, 153, nullptr, 570, 3);
}
} else if (_isOnRight && _G(player).click_x <= 300) {
_flag3 = player_said("EXIT") && _flag2;
@@ -3574,9 +3574,9 @@ bool Room504::parser1() {
} else if (inv_player_has("SHOVEL")) {
kernel_timing_trigger(1, 755);
} else if (_flag2) {
- ws_walk(528, 168, nullptr, 558, 8);
+ ws_walk(_G(my_walker), 528, 168, nullptr, 558, 8);
} else {
- ws_walk(528, 168, nullptr, 734, 8);
+ ws_walk(_G(my_walker), 528, 168, nullptr, 734, 8);
}
} else {
return false;
diff --git a/engines/m4/riddle/rooms/section5/room506.cpp b/engines/m4/riddle/rooms/section5/room506.cpp
index bfd6cbf31fd..64204625afe 100644
--- a/engines/m4/riddle/rooms/section5/room506.cpp
+++ b/engines/m4/riddle/rooms/section5/room506.cpp
@@ -76,7 +76,7 @@ void Room506::init() {
case 507:
digi_unload("507_s02");
ws_demand_location(_G(my_walker), 346, 214, 4);
- ws_walk(420, 234, nullptr, 502, 4);
+ ws_walk(_G(my_walker), 420, 234, nullptr, 502, 4);
player_set_commands_allowed(false);
break;
@@ -93,14 +93,14 @@ void Room506::init() {
digi_play("506_S02", 1);
} else {
ws_demand_location(_G(my_walker), 346, 214, 4);
- ws_walk(420, 234, nullptr, 502, 4);
+ ws_walk(_G(my_walker), 420, 234, nullptr, 502, 4);
}
break;
default:
MoveScreenDelta(-432, 0);
ws_demand_location(_G(my_walker), 754, 242, 8);
- ws_walk(697, 247, nullptr, 502, 8);
+ ws_walk(_G(my_walker), 697, 247, nullptr, 502, 8);
break;
}
@@ -154,10 +154,10 @@ void Room506::pre_parser() {
_G(please_hyperwalk) = true;
if (_towerFlag) {
- ws_walk(_destX, _destY, nullptr, 1002, _destFacing);
+ ws_walk(_G(my_walker), _destX, _destY, nullptr, 1002, _destFacing);
Common::strcpy_s(_G(player).verb, "IN TOWER");
} else {
- ws_walk(_destX, _destY, nullptr, -1, _destFacing);
+ ws_walk(_G(my_walker), _destX, _destY, nullptr, -1, _destFacing);
}
restorePalette();
@@ -168,10 +168,10 @@ void Room506::pre_parser() {
_G(please_hyperwalk) = true;
if (_towerFlag) {
- ws_walk(_destX, _destY, nullptr, 1002, _destFacing);
+ ws_walk(_G(my_walker), _destX, _destY, nullptr, 1002, _destFacing);
Common::strcpy_s(_G(player).verb, "IN TOWER");
} else {
- ws_walk(_destX, _destY, nullptr, -1, _destFacing);
+ ws_walk(_G(my_walker), _destX, _destY, nullptr, -1, _destFacing);
}
break;
@@ -193,12 +193,12 @@ void Room506::pre_parser() {
if (_G(player).walk_x < 900 && _flag2 && !player_said(" ") && !player_said(" ")) {
saveWalk();
- ws_walk(717, 144, nullptr, 1000, 1);
+ ws_walk(_G(my_walker), 717, 144, nullptr, 1000, 1);
}
if (_G(player).walk_x > 900 && _flag3 && !player_said(" ") && !player_said(" ")) {
saveWalk();
- ws_walk(995, 308, nullptr, 1001, 1);
+ ws_walk(_G(my_walker), 995, 308, nullptr, 1001, 1);
}
}
}
@@ -385,7 +385,7 @@ void Room506::parser() {
} else {
if (player_said(" ")) {
restorePalette();
- ws_walk(662, 143, nullptr, -1, 8);
+ ws_walk(_G(my_walker), 662, 143, nullptr, -1, 8);
if (_towerFlag)
Common::strcpy_s(_G(player).verb, "IN TOWER");
@@ -393,7 +393,7 @@ void Room506::parser() {
if (player_said(" ")) {
setupPalette();
- ws_walk(1039, 328, nullptr, -1, 4);
+ ws_walk(_G(my_walker), 1039, 328, nullptr, -1, 4);
if (_towerFlag)
Common::strcpy_s(_G(player).verb, "IN TOWER");
diff --git a/engines/m4/riddle/rooms/section5/room508.cpp b/engines/m4/riddle/rooms/section5/room508.cpp
index bb5c09eeb47..5b1b5036069 100644
--- a/engines/m4/riddle/rooms/section5/room508.cpp
+++ b/engines/m4/riddle/rooms/section5/room508.cpp
@@ -53,7 +53,7 @@ void Room508::init() {
} else if (_G(game).previous_room != KERNEL_RESTORING_GAME) {
ws_demand_location(_G(my_walker), 246, 265, 5);
- ws_walk(256, 283, nullptr, 562, 5);
+ ws_walk(_G(my_walker), 256, 283, nullptr, 562, 5);
}
if (_G(flags)[V157] == 1) {
@@ -102,7 +102,7 @@ void Room508::daemon() {
switch (_G(kernel).trigger) {
case 503:
player_set_commands_allowed(false);
- ws_walk(423, 356, nullptr, 504, 1);
+ ws_walk(_G(my_walker), 423, 356, nullptr, 504, 1);
break;
case 504:
@@ -397,7 +397,7 @@ void Room508::daemon() {
terminateMachineAndNull(_ripley);
ws_unhide_walker();
ws_demand_location(_G(my_walker), 437, 349, 1);
- ws_walk(436, 359, nullptr, 548, 10);
+ ws_walk(_G(my_walker), 436, 359, nullptr, 548, 10);
break;
case 675:
@@ -463,7 +463,7 @@ void Room508::parser() {
case -1:
case 666:
player_set_commands_allowed(false);
- ws_walk(317, 360, nullptr, 2, 1);
+ ws_walk(_G(my_walker), 317, 360, nullptr, 2, 1);
break;
case 2:
@@ -496,7 +496,7 @@ void Room508::parser() {
case -1:
case 666:
player_set_commands_allowed(false);
- ws_walk(237, 255, nullptr, -1, 11);
+ ws_walk(_G(my_walker), 237, 255, nullptr, -1, 11);
pal_fade_init(21, 255, 0, 30, 2);
break;
@@ -510,7 +510,7 @@ void Room508::parser() {
} else if (player_said("SHOVEL") && player_said("HOLE IN CAPSTAN")) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(423, 356, nullptr, 2, 1);
+ ws_walk(_G(my_walker), 423, 356, nullptr, 2, 1);
break;
case 2:
@@ -545,7 +545,7 @@ void Room508::parser() {
switch (_G(kernel).trigger) {
case -1:
case 666:
- ws_walk(317, 360, nullptr, 2, 1);
+ ws_walk(_G(my_walker), 317, 360, nullptr, 2, 1);
break;
case 2:
@@ -583,7 +583,7 @@ void Room508::parser() {
switch (_G(kernel).trigger) {
case -1:
case 666:
- ws_walk(333, 290, nullptr, 2, 3);
+ ws_walk(_G(my_walker), 333, 290, nullptr, 2, 3);
break;
case 2:
@@ -593,7 +593,7 @@ void Room508::parser() {
_skull = series_place_sprite("SKULL SPRITE AFTER DOME TURN", 0, 0, 0, 100, 0x450);
inv_move_object("CRYSTAL SKULL", 508);
- ws_walk(317, 360, nullptr, 3, 1);
+ ws_walk(_G(my_walker), 317, 360, nullptr, 3, 1);
break;
case 3:
@@ -608,7 +608,7 @@ void Room508::parser() {
case -1:
case 666:
if (inv_object_is_here("CRYSTAL SKULL")) {
- ws_walk(333, 290, nullptr, 2, 3);
+ ws_walk(_G(my_walker), 333, 290, nullptr, 2, 3);
}
break;
@@ -620,7 +620,7 @@ void Room508::parser() {
case 3:
inv_give_to_player("CRYSTAL SKULL");
- ws_walk(317, 360, nullptr, 4, 1);
+ ws_walk(_G(my_walker), 317, 360, nullptr, 4, 1);
break;
case 4:
diff --git a/engines/m4/riddle/rooms/section5/room509.cpp b/engines/m4/riddle/rooms/section5/room509.cpp
index 3acc271731d..21e8328635b 100644
--- a/engines/m4/riddle/rooms/section5/room509.cpp
+++ b/engines/m4/riddle/rooms/section5/room509.cpp
@@ -149,7 +149,7 @@ void Room509::parser() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- ws_walk(313, 271, nullptr, 1, 2);
+ ws_walk(_G(my_walker), 313, 271, nullptr, 1, 2);
break;
case 1:
setGlobals1(_ripMedHighReacher, 1, 9, 9, 9, 0, 9, 10, 10, 10, 0,
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 99d53f365c2..af86f3d9239 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -148,7 +148,7 @@ void Room510::daemon() {
terminateMachineAndNull(_steps);
ws_unhide_walker();
series_unload(_stepsSeries);
- ws_walk(407, 97, nullptr, 999, 8);
+ ws_walk(_G(my_walker), 407, 97, nullptr, 999, 8);
break;
case 999:
@@ -382,7 +382,7 @@ void Room510::parser() {
switch (_G(kernel).trigger) {
case -1:
if (inv_object_is_here("WOODEN LADDER") && !_G(flags)[V169]) {
- ws_walk(395, 121, nullptr, 1, 5);
+ ws_walk(_G(my_walker), 395, 121, nullptr, 1, 5);
}
break;
case 1:
@@ -516,7 +516,7 @@ void Room510::parser() {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(395, 121, nullptr, 1, 7);
+ ws_walk(_G(my_walker), 395, 121, nullptr, 1, 7);
break;
case 1:
player_set_commands_allowed(false);
@@ -603,7 +603,7 @@ void Room510::parser() {
} else {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(425, 128, nullptr, 1, 11);
+ ws_walk(_G(my_walker), 425, 128, nullptr, 1, 11);
break;
case 1:
player_set_commands_allowed(false);
@@ -766,7 +766,7 @@ void Room510::parser() {
} else {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(407, 97, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 407, 97, nullptr, 1, 10);
break;
case 1:
player_set_commands_allowed(false);
@@ -824,7 +824,7 @@ void Room510::parser() {
bool Room510::useAltarPost() {
switch (_G(kernel.trigger)) {
case -1:
- ws_walk(382, 111, nullptr, 666, 11);
+ ws_walk(_G(my_walker), 382, 111, nullptr, 666, 11);
break;
case 1:
@@ -993,7 +993,7 @@ bool Room510::takeVinesRope() {
return true;
}
- ws_walk(395, 121, nullptr, 1, 5);
+ ws_walk(_G(my_walker), 395, 121, nullptr, 1, 5);
break;
case 1:
@@ -1077,7 +1077,7 @@ void Room510::useVines() {
switch (_G(kernel).trigger) {
case -1:
other_save_game_for_resurrection();
- ws_walk(425, 128, nullptr, 1, 11);
+ ws_walk(_G(my_walker), 425, 128, nullptr, 1, 11);
break;
case 1:
@@ -1202,7 +1202,7 @@ void Room510::woodenLadder() {
void Room510::altar() {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(395, 121, nullptr, 1, 7);
+ ws_walk(_G(my_walker), 395, 121, nullptr, 1, 7);
break;
case 1:
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index a2716a66321..bb9dd374c67 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -184,7 +184,7 @@ void Room603::init() {
player_set_commands_allowed(false);
digi_preload("950_s28a");
ws_demand_location(_G(my_walker), 542, 230, 2);
- ws_walk(534, 240, nullptr, 5, 7);
+ ws_walk(_G(my_walker), 534, 240, nullptr, 5, 7);
break;
case 605:
@@ -198,14 +198,14 @@ void Room603::init() {
player_set_commands_allowed(false);
ws_demand_location(_G(my_walker), 670, 232, 2);
- ws_walk(497, 245, nullptr, 1, 8);
+ ws_walk(_G(my_walker), 497, 245, nullptr, 1, 8);
break;
default:
player_set_commands_allowed(false);
digi_preload("950_s28a");
ws_demand_location(_G(my_walker), 67, 391, 2);
- ws_walk(135, 356, nullptr, 1, 2);
+ ws_walk(_G(my_walker), 135, 356, nullptr, 1, 2);
break;
}
@@ -531,7 +531,7 @@ void Room603::daemon() {
Common::strcpy_s(_G(player).verb, "talk to");
Common::strcpy_s(_G(player).noun, "person in pit");
_G(kernel).trigger_mode = KT_PARSE;
- ws_walk(311, 306, nullptr, 666, 10);
+ ws_walk(_G(my_walker), 311, 306, nullptr, 666, 10);
_G(kernel).trigger_mode = KT_DAEMON;
_G(player).disable_hyperwalk = false;
break;
@@ -590,7 +590,7 @@ void Room603::daemon() {
terminateMachineAndNull(_ripley);
ws_unhide_walker();
terminateMachineAndNull(_shadow);
- ws_walk(670, 232, nullptr, -1, 3);
+ ws_walk(_G(my_walker), 670, 232, nullptr, -1, 3);
break;
default:
@@ -802,7 +802,7 @@ void Room603::daemon() {
terminateMachineAndNull(_shadow);
ws_unhide_walker();
ws_demand_facing(_G(my_walker), 4);
- ws_walk(345, 300, nullptr, -1, 10);
+ ws_walk(_G(my_walker), 345, 300, nullptr, -1, 10);
break;
case 326:
@@ -976,7 +976,7 @@ void Room603::daemon() {
break;
case 406:
- ws_walk(459, 236, nullptr, 404, 2);
+ ws_walk(_G(my_walker), 459, 236, nullptr, 404, 2);
break;
case 410:
@@ -1728,7 +1728,7 @@ void Room603::conv603a() {
break;
case 15:
- ws_walk(345, 300, nullptr, 16, 10);
+ ws_walk(_G(my_walker), 345, 300, nullptr, 16, 10);
break;
case 16:
@@ -1951,9 +1951,9 @@ bool Room603::takeSleeve() {
case -1:
if (inv_object_is_here("sleeve")) {
if (_val5)
- ws_walk(345, 300, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 345, 300, nullptr, 1, 10);
else
- ws_walk(311, 308, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 311, 308, nullptr, 1, 10);
return true;
}
break;
@@ -1989,7 +1989,7 @@ bool Room603::takeSleeve() {
_ttShould = 17;
kernel_timing_trigger(1, _val5 ? 400 : 500, KT_DAEMON, KT_PARSE);
sendWSMessage_150000(-1);
- ws_walk(365, 298, nullptr, 666, 10);
+ ws_walk(_G(my_walker), 365, 298, nullptr, 666, 10);
_val4 = 1;
return true;
More information about the Scummvm-git-logs
mailing list