[Scummvm-git-logs] scummvm master -> 05f3c1dfee98021099d8b90dfd7b4604d79bb896
Strangerke
noreply at scummvm.org
Mon Feb 10 23:18:18 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dae310ed83 M4: RIDDLE: Remove useless assignments in conv_io, reduce some variable scopes
05f3c1dfee M4: RIDDLE: Fix calls to ws_walk in room group 6 and 8
Commit: dae310ed83e5ea4c8dc3120513bcfb09e9a8779f
https://github.com/scummvm/scummvm/commit/dae310ed83e5ea4c8dc3120513bcfb09e9a8779f
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-11T00:17:57+01:00
Commit Message:
M4: RIDDLE: Remove useless assignments in conv_io, reduce some variable scopes
Changed paths:
engines/m4/adv_r/adv_walk.cpp
engines/m4/adv_r/conv_io.cpp
diff --git a/engines/m4/adv_r/adv_walk.cpp b/engines/m4/adv_r/adv_walk.cpp
index f14a8a49a7b..4571960714e 100644
--- a/engines/m4/adv_r/adv_walk.cpp
+++ b/engines/m4/adv_r/adv_walk.cpp
@@ -261,14 +261,12 @@ void ws_demand_facing(machine *myWalker, int32 facing) {
}
void ws_demand_location(machine *myWalker, int32 x, int32 y, int facing) {
- frac16 s;
-
if (!myWalker || !myWalker->myAnim8) {
term_message("demand locn, no walker");
return;
}
- s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
+ frac16 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
_G(globals)[GLB_TEMP_1] = x << 16;
_G(globals)[GLB_TEMP_2] = y << 16;
@@ -281,14 +279,12 @@ void ws_demand_location(machine *myWalker, int32 x, int32 y, int facing) {
}
static void ws_demand_location_and_facing(machine *myWalker, int32 x, int32 y, int32 facing) {
- frac16 s;
-
if ((!myWalker) || (!myWalker->myAnim8)) {
term_message("demand f & l, no walker");
return;
}
- s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
+ frac16 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
_G(globals)[GLB_TEMP_1] = x << 16;
_G(globals)[GLB_TEMP_2] = y << 16;
diff --git a/engines/m4/adv_r/conv_io.cpp b/engines/m4/adv_r/conv_io.cpp
index 66d188140b1..52178d607d9 100644
--- a/engines/m4/adv_r/conv_io.cpp
+++ b/engines/m4/adv_r/conv_io.cpp
@@ -50,13 +50,11 @@ namespace M4 {
#define DECL_POINTER 1
void Converstation_Globals::syncGame(Common::Serializer &s) {
- uint32 count;
-
if (s.isLoading())
conv_reset_all();
// Handle size
- count = convSave.size();
+ uint32 count = convSave.size();
s.syncAsUint32LE(count);
if (s.isLoading())
convSave.resize(count);
@@ -73,9 +71,7 @@ void Converstation_Globals::conv_reset_all() {
/*------------------------------------------------------------------------*/
void cdd_init(void) {
- int i;
-
- for (i = 0; i < 16; i++) {
+ for (int i = 0; i < 16; i++) {
_G(cdd).text[i] = nullptr;
_G(cdd).snd_files[i] = nullptr;
}
@@ -195,7 +191,6 @@ void conv_set_decl_val(Conv *c, decl_chunk *decl, int32 val) {
void conv_export_value(Conv *c, int32 val, int index) {
int32 ent = 0, tag = 0, next;
- decl_chunk *decl;
int32 ent_old = 0;
int i = 0;
@@ -212,7 +207,7 @@ void conv_export_value(Conv *c, int32 val, int index) {
switch (tag) {
case DECL_CHUNK:
if (i == index) {
- decl = get_decl(c, ent);
+ decl_chunk *decl = get_decl(c, ent);
conv_set_decl_val(c, decl, val);
}
i++;
@@ -390,9 +385,9 @@ static void conv_save_state(Conv *c) {
// if consave data exists, read it in
int32 file_size = 0;
- int32 offset = -1;
- int32 prev_size = 0;
- char *conv_save_buff = nullptr;
+ int32 offset;
+ int32 prev_size;
+ char *conv_save_buff;
bool overwrite_file = false;
if (!_GC(convSave).empty()) {
Commit: 05f3c1dfee98021099d8b90dfd7b4604d79bb896
https://github.com/scummvm/scummvm/commit/05f3c1dfee98021099d8b90dfd7b4604d79bb896
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-11T00:17:57+01:00
Commit Message:
M4: RIDDLE: Fix calls to ws_walk in room group 6 and 8
Changed paths:
engines/m4/riddle/riddle.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/room642.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/room650.cpp
engines/m4/riddle/rooms/section6/room651.cpp
engines/m4/riddle/rooms/section8/room806.cpp
engines/m4/riddle/rooms/section8/room808.cpp
diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index 83d8580b133..779fa6e8fa2 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -319,7 +319,7 @@ void RiddleEngine::global_parser() {
case 2:
case 3:
case 4:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 5, 1);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 5, 1);
break;
case 5:
case 7:
@@ -330,7 +330,7 @@ void RiddleEngine::global_parser() {
case 9:
case 10:
case 11:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 7, 1);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 7, 1);
break;
default:
player_set_commands_allowed(false);
@@ -352,7 +352,7 @@ void RiddleEngine::global_parser() {
switch (_G(player_info).facing) {
case 1:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 2, 1);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 2, 1);
break;
case 2:
case 3:
@@ -362,14 +362,14 @@ void RiddleEngine::global_parser() {
break;
case 4:
case 5:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 3, 1);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 3, 1);
break;
case 7:
case 8:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 9, 1);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 9, 1);
break;
case 11:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 10, 1);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 10, 1);
break;
default:
break;
@@ -639,30 +639,30 @@ void sketchInJournal(const char *digiName) {
switch (_G(player_info).facing) {
case 1:
case 2:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 1, 2);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 2);
break;
case 3:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 1, 3);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 3);
break;
case 4:
case 5:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 1, 4);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 4);
break;
case 7:
case 8:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 1, 8);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 8);
break;
case 9:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 1, 9);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 9);
break;
case 10:
case 11:
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 1, 10);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 10);
break;
default:
diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index f1f2c50dd0d..4cca7d36dcd 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -177,7 +177,7 @@ void Room604::daemon() {
switch (_G(kernel).trigger) {
case 10:
ws_unhide_walker();
- ws_walk(374, 330, nullptr, 11, 10);
+ ws_walk(_G(my_walker), 374, 330, nullptr, 11, 10);
break;
case 11:
@@ -190,7 +190,7 @@ void Room604::daemon() {
break;
case 50:
- ws_walk(238, 339, nullptr, 52, 3);
+ ws_walk(_G(my_walker), 238, 339, nullptr, 52, 3);
break;
case 52:
@@ -261,7 +261,7 @@ void Room604::parser() {
} else if (player_said("PULL CORD", "generator set")) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(362, 316, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 362, 316, nullptr, 1, 1);
break;
case 1:
player_set_commands_allowed(false);
@@ -317,7 +317,7 @@ void Room604::parser() {
} else {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(357, 311, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 357, 311, nullptr, 1, 1);
break;
case 1:
if (_G(flags)[V203] == 8) {
@@ -360,7 +360,7 @@ void Room604::parser() {
break;
case 4:
- ws_walk(381, 329, nullptr, 5, 9);
+ ws_walk(_G(my_walker), 381, 329, nullptr, 5, 9);
break;
case 5:
@@ -489,7 +489,7 @@ void Room604::parser() {
if (_G(flags)[V203] == 8) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(331, 323, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 331, 323, nullptr, 1, 10);
break;
case 1:
player_set_commands_allowed(false);
@@ -526,7 +526,7 @@ void Room604::parser() {
switch (_G(kernel).trigger) {
case -1:
if (_G(flags)[V190])
- ws_walk(289, 312, nullptr, 1, 11);
+ ws_walk(_G(my_walker), 289, 312, nullptr, 1, 11);
else
digi_play("604r12", 1);
break;
@@ -837,7 +837,7 @@ void Room604::killRipley() {
}
}
- ws_walk(381, 329, nullptr, 3, 9);
+ ws_walk(_G(my_walker), 381, 329, nullptr, 3, 9);
break;
case 2:
@@ -1081,7 +1081,7 @@ void Room604::takeLighter() {
if (!inv_object_is_here("LIGHTER"))
return;
- ws_walk(331, 323, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 331, 323, nullptr, 1, 10);
break;
case 1:
@@ -1112,7 +1112,7 @@ void Room604::pullCordPlug() {
if (_G(flags)[V190]) {
if (!inv_player_has("PULL CORD"))
return;
- ws_walk(289, 312, nullptr, 1, 11);
+ ws_walk(_G(my_walker), 289, 312, nullptr, 1, 11);
} else {
digi_play("604r12", 1);
}
diff --git a/engines/m4/riddle/rooms/section6/room605.cpp b/engines/m4/riddle/rooms/section6/room605.cpp
index 5b407eaf9f7..f67868d8259 100644
--- a/engines/m4/riddle/rooms/section6/room605.cpp
+++ b/engines/m4/riddle/rooms/section6/room605.cpp
@@ -83,7 +83,7 @@ void Room605::init() {
player_set_commands_allowed(false);
_G(player).disable_hyperwalk = true;
ws_demand_location(_G(my_walker), 451, 368, 1);
- ws_walk(513, 316, nullptr, -1, 10);
+ ws_walk(_G(my_walker), 513, 316, nullptr, -1, 10);
ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
@@ -101,12 +101,12 @@ void Room605::init() {
digi_stop(3);
digi_unload("950_s28b");
ws_demand_location(_G(my_walker), 534, 219, 7);
- ws_walk(520, 263, nullptr, -1, 7);
+ ws_walk(_G(my_walker), 520, 263, nullptr, -1, 7);
break;
case 623:
ws_demand_location(_G(my_walker), -30, 272, 3);
- ws_walk(34, 272, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 34, 272, nullptr, 1, 3);
break;
default:
@@ -322,7 +322,7 @@ void Room605::daemon() {
break;
case 211:
- ws_walk(680, 183, nullptr, -1, 3);
+ ws_walk(_G(my_walker), 680, 183, nullptr, -1, 3);
break;
case 300:
@@ -571,7 +571,7 @@ void Room605::conv605a() {
break;
case 2:
- ws_walk(513, 316, nullptr, 3, 10);
+ ws_walk(_G(my_walker), 513, 316, nullptr, 3, 10);
return;
case 3:
diff --git a/engines/m4/riddle/rooms/section6/room607.cpp b/engines/m4/riddle/rooms/section6/room607.cpp
index 4c54b00c9d8..3b68ac61e8c 100644
--- a/engines/m4/riddle/rooms/section6/room607.cpp
+++ b/engines/m4/riddle/rooms/section6/room607.cpp
@@ -73,13 +73,13 @@ void Room607::init() {
case 638:
ws_demand_location(_G(my_walker), -30, 334, 3);
- ws_walk(32, 334, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 32, 334, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 640:
ws_demand_location(_G(my_walker), 670, 288, 9);
- ws_walk(604, 288, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 604, 288, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
@@ -173,7 +173,7 @@ void Room607::parser() {
player_set_commands_allowed(false);
terminateMachineAndNull(_rock);
_rock = series_show("ROCK BOTTOM", 0x400, 16);
- ws_walk(360, 315, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 360, 315, nullptr, 1, 1);
break;
case 1:
ws_hide_walker();
@@ -197,7 +197,7 @@ void Room607::parser() {
break;
case 7:
ws_unhide_walker();
- ws_walk(383, 319, nullptr, 9, 0);
+ ws_walk(_G(my_walker), 383, 319, nullptr, 9, 0);
break;
case 9:
terminateMachineAndNull(_rock);
@@ -211,7 +211,7 @@ void Room607::parser() {
} else if (useFlag && player_said("GREY ROCK") && !_G(flags)[V193]) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(431, 311, nullptr, 2, 9);
+ ws_walk(_G(my_walker), 431, 311, nullptr, 2, 9);
break;
case 2:
player_set_commands_allowed(false);
@@ -272,7 +272,7 @@ void Room607::parser() {
} else if (player_said("HORN/PULL CORD/WATER", "CLAY") && !_G(flags)[V193]) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(311, 349, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 311, 349, nullptr, 1, 1);
break;
case 1:
player_set_commands_allowed(false);
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index 66db5fd7819..f13c74cf16a 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -136,7 +136,7 @@ void Room608::init() {
player_set_commands_allowed(false);
_G(player).disable_hyperwalk = true;
ws_demand_location(_G(my_walker), -30, 345, 1);
- ws_walk(43, 345, nullptr, 18, 3);
+ ws_walk(_G(my_walker), 43, 345, nullptr, 18, 3);
ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
@@ -186,7 +186,7 @@ void Room608::init() {
if (_G(flags)[V203] != 2) {
player_set_commands_allowed(false);
ws_demand_location(_G(my_walker), -30, 345, 3);
- ws_walk(43, 345, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 43, 345, nullptr, 1, 3);
}
break;
@@ -876,7 +876,7 @@ void Room608::daemon() {
break;
case 501:
- ws_walk(465, 284, nullptr, 503, 1);
+ ws_walk(_G(my_walker), 465, 284, nullptr, 503, 1);
break;
case 503:
@@ -1124,7 +1124,7 @@ void Room608::daemon() {
break;
case 699:
- ws_walk(43, 345, nullptr, -1, 3);
+ ws_walk(_G(my_walker), 43, 345, nullptr, -1, 3);
break;
case 700:
@@ -1520,7 +1520,7 @@ void Room608::parser() {
} else if (player_said("POLE", "DRIFTWOOD STUMP ") && inv_player_has("POLE")) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(453, 311, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 453, 311, nullptr, 1, 1);
break;
case 1:
player_set_commands_allowed(false);
@@ -1560,7 +1560,7 @@ void Room608::parser() {
} else if (takeFlag && player_said("POLE") && !inv_player_has("POLE")) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(453, 311, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 453, 311, nullptr, 1, 1);
break;
case 1:
player_set_commands_allowed(false);
@@ -1901,7 +1901,7 @@ bool Room608::stumpHole() {
switch (_G(kernel).trigger) {
case -1:
if (inv_player_has("DRIFTWOOD STUMP")) {
- ws_walk(474, 309, nullptr, 1, 2);
+ ws_walk(_G(my_walker), 474, 309, nullptr, 1, 2);
return true;
}
break;
@@ -1939,7 +1939,7 @@ bool Room608::takeStump2() {
} else {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(474, 309, nullptr, 1, 2);
+ ws_walk(_G(my_walker), 474, 309, nullptr, 1, 2);
break;
case 1:
@@ -2011,7 +2011,7 @@ bool Room608::hornCordWater() {
} else {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(64, 354, nullptr, 1, 7);
+ ws_walk(_G(my_walker), 64, 354, nullptr, 1, 7);
return true;
case 1:
@@ -2086,7 +2086,7 @@ bool Room608::lookPuffin() {
void Room608::usePole() {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(453, 311, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 453, 311, nullptr, 1, 1);
break;
case 1:
@@ -2140,7 +2140,7 @@ void Room608::usePole() {
ws_unhide_walker();
player_update_info();
- ws_walk(_G(player_info).x + 1, _G(player_info).y,
+ ws_walk(_G(my_walker), _G(player_info).x + 1, _G(player_info).y,
nullptr, 12, 4);
break;
@@ -2162,7 +2162,7 @@ void Room608::usePole() {
// call for animating old lady. Is something supposed to set a value?
// For now, do a dummy ws_walk to reset internal states
player_update_info();
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, -1, 4);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, -1, 4);
sendWSMessage_110000(2);
digi_play("608r16", 1, 255, 20);
diff --git a/engines/m4/riddle/rooms/section6/room610.cpp b/engines/m4/riddle/rooms/section6/room610.cpp
index 3ac7a338f94..707928dc38e 100644
--- a/engines/m4/riddle/rooms/section6/room610.cpp
+++ b/engines/m4/riddle/rooms/section6/room610.cpp
@@ -104,7 +104,7 @@ void Room610::init() {
setup();
player_set_commands_allowed(false);
ws_demand_location(_G(my_walker), 665, 364, 9);
- ws_walk(615, 364, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 615, 364, nullptr, 1, 10);
} else {
sendWSMessage_10000(1, _k, _k00, 1, 50, -1, _k00, 50, 60, 4);
sendWSMessage_10000(1, _sgTt, _sgSlapsTt1, 1, 1, -1,
@@ -112,7 +112,7 @@ void Room610::init() {
player_set_commands_allowed(false);
ws_demand_location(_G(my_walker), 665, 364, 9);
- ws_walk(240, 272, nullptr, 10, 10);
+ ws_walk(_G(my_walker), 240, 272, nullptr, 10, 10);
kernel_timing_trigger(1, 100);
}
break;
@@ -743,7 +743,7 @@ void Room610::daemonPostprocess() {
!player_said("talk to", "SAMANTHA") &&
_G(player_info).x <= 222) {
intr_cancel_sentence();
- ws_walk(202, 244, nullptr, 666, 11);
+ ws_walk(_G(my_walker), 202, 244, nullptr, 666, 11);
_flag1 = true;
_val5 = 2;
_sgShould = 4;
diff --git a/engines/m4/riddle/rooms/section6/room620.cpp b/engines/m4/riddle/rooms/section6/room620.cpp
index 296a7e907ca..a33276e9106 100644
--- a/engines/m4/riddle/rooms/section6/room620.cpp
+++ b/engines/m4/riddle/rooms/section6/room620.cpp
@@ -35,7 +35,7 @@ void Room620::init() {
case 621:
ws_demand_location(_G(my_walker), 670, 322, 9);
- ws_walk(605, 322, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 322, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room621.cpp b/engines/m4/riddle/rooms/section6/room621.cpp
index 7fd0f10d7cb..f6efc8aa559 100644
--- a/engines/m4/riddle/rooms/section6/room621.cpp
+++ b/engines/m4/riddle/rooms/section6/room621.cpp
@@ -35,13 +35,13 @@ void Room621::init() {
case 620:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 622:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room622.cpp b/engines/m4/riddle/rooms/section6/room622.cpp
index b9b2d6bc39d..9e252c1d393 100644
--- a/engines/m4/riddle/rooms/section6/room622.cpp
+++ b/engines/m4/riddle/rooms/section6/room622.cpp
@@ -35,13 +35,13 @@ void Room622::init() {
case 621:
ws_demand_location(_G(my_walker), -30, 362, 3);
- ws_walk(30, 362, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 362, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 623:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room623.cpp b/engines/m4/riddle/rooms/section6/room623.cpp
index e63300a3c34..ad8fa97f0af 100644
--- a/engines/m4/riddle/rooms/section6/room623.cpp
+++ b/engines/m4/riddle/rooms/section6/room623.cpp
@@ -42,13 +42,13 @@ void Room623::init() {
case 622:
ws_demand_location(_G(my_walker), -30, 362, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 624:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room624.cpp b/engines/m4/riddle/rooms/section6/room624.cpp
index f17dfb9f0a5..6c3eaf352e2 100644
--- a/engines/m4/riddle/rooms/section6/room624.cpp
+++ b/engines/m4/riddle/rooms/section6/room624.cpp
@@ -35,13 +35,13 @@ void Room624::init() {
case 623:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 625:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room625.cpp b/engines/m4/riddle/rooms/section6/room625.cpp
index 0debf7ca6be..a9c9176b026 100644
--- a/engines/m4/riddle/rooms/section6/room625.cpp
+++ b/engines/m4/riddle/rooms/section6/room625.cpp
@@ -36,14 +36,14 @@ void Room625::init() {
case 624:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
default:
digi_preload("950_28c");
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 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 b5b5fb75ad1..c301b55d9e6 100644
--- a/engines/m4/riddle/rooms/section6/room626.cpp
+++ b/engines/m4/riddle/rooms/section6/room626.cpp
@@ -40,7 +40,7 @@ void Room626::init() {
case 627:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room627.cpp b/engines/m4/riddle/rooms/section6/room627.cpp
index 52bedce4da5..b95e94bbe72 100644
--- a/engines/m4/riddle/rooms/section6/room627.cpp
+++ b/engines/m4/riddle/rooms/section6/room627.cpp
@@ -39,13 +39,13 @@ void Room627::init() {
case 626:
ws_demand_location(_G(my_walker), -30, 328, 3);
- ws_walk(30, 328, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 328, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 628:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room628.cpp b/engines/m4/riddle/rooms/section6/room628.cpp
index 27465fe1b9e..5ba2b86ba06 100644
--- a/engines/m4/riddle/rooms/section6/room628.cpp
+++ b/engines/m4/riddle/rooms/section6/room628.cpp
@@ -39,13 +39,13 @@ void Room628::init() {
case 627:
ws_demand_location(_G(my_walker), -30, 292, 3);
- ws_walk(30, 292, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 292, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 629:
ws_demand_location(_G(my_walker), 670, 330, 9);
- ws_walk(605, 330, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 330, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room629.cpp b/engines/m4/riddle/rooms/section6/room629.cpp
index 5b65c83507a..b36bcb87555 100644
--- a/engines/m4/riddle/rooms/section6/room629.cpp
+++ b/engines/m4/riddle/rooms/section6/room629.cpp
@@ -39,13 +39,13 @@ void Room629::init() {
case 628:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 630:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room630.cpp b/engines/m4/riddle/rooms/section6/room630.cpp
index 8ff4a8eaa1a..24e8f3d8d0b 100644
--- a/engines/m4/riddle/rooms/section6/room630.cpp
+++ b/engines/m4/riddle/rooms/section6/room630.cpp
@@ -39,7 +39,7 @@ void Room630::init() {
case 629:
ws_demand_location(_G(my_walker), -30, 333, 3);
- ws_walk(30, 333, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 333, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room631.cpp b/engines/m4/riddle/rooms/section6/room631.cpp
index b5366e900b2..3fbe5a9a3f3 100644
--- a/engines/m4/riddle/rooms/section6/room631.cpp
+++ b/engines/m4/riddle/rooms/section6/room631.cpp
@@ -39,7 +39,7 @@ void Room631::init() {
case 632:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room632.cpp b/engines/m4/riddle/rooms/section6/room632.cpp
index c0f4fc33078..f1b4bdf3c61 100644
--- a/engines/m4/riddle/rooms/section6/room632.cpp
+++ b/engines/m4/riddle/rooms/section6/room632.cpp
@@ -39,13 +39,13 @@ void Room632::init() {
case 631:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 633:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room633.cpp b/engines/m4/riddle/rooms/section6/room633.cpp
index efe1e25d264..9207a701236 100644
--- a/engines/m4/riddle/rooms/section6/room633.cpp
+++ b/engines/m4/riddle/rooms/section6/room633.cpp
@@ -43,13 +43,13 @@ void Room633::init() {
case 632:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 634:
ws_demand_location(_G(my_walker), 670, 290, 9);
- ws_walk(605, 290, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 290, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room634.cpp b/engines/m4/riddle/rooms/section6/room634.cpp
index 12bdb488ca1..10f96f28c33 100644
--- a/engines/m4/riddle/rooms/section6/room634.cpp
+++ b/engines/m4/riddle/rooms/section6/room634.cpp
@@ -39,13 +39,13 @@ void Room634::init() {
case 633:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(30, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 635:
ws_demand_location(_G(my_walker), 670, 310, 9);
- ws_walk(605, 310, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 310, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room635.cpp b/engines/m4/riddle/rooms/section6/room635.cpp
index 70e6486f721..a7e20d2ef40 100644
--- a/engines/m4/riddle/rooms/section6/room635.cpp
+++ b/engines/m4/riddle/rooms/section6/room635.cpp
@@ -39,13 +39,13 @@ void Room635::init() {
case 634:
ws_demand_location(_G(my_walker), -30, 321, 3);
- ws_walk(30, 321, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 321, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 636:
ws_demand_location(_G(my_walker), 670, 316, 9);
- ws_walk(605, 316, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 605, 316, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room636.cpp b/engines/m4/riddle/rooms/section6/room636.cpp
index 31211c10c4a..004bff95a26 100644
--- a/engines/m4/riddle/rooms/section6/room636.cpp
+++ b/engines/m4/riddle/rooms/section6/room636.cpp
@@ -35,7 +35,7 @@ void Room636::init() {
case 635:
ws_demand_location(_G(my_walker), -30, 346, 3);
- ws_walk(30, 346, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 346, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room637.cpp b/engines/m4/riddle/rooms/section6/room637.cpp
index bca8ec75c86..6c656e57f59 100644
--- a/engines/m4/riddle/rooms/section6/room637.cpp
+++ b/engines/m4/riddle/rooms/section6/room637.cpp
@@ -39,7 +39,7 @@ void Room637::init() {
case 638:
ws_demand_location(_G(my_walker), 670, 336, 9);
- ws_walk(621, 336, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 621, 336, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room638.cpp b/engines/m4/riddle/rooms/section6/room638.cpp
index 5fd2a31070c..167f6d175a7 100644
--- a/engines/m4/riddle/rooms/section6/room638.cpp
+++ b/engines/m4/riddle/rooms/section6/room638.cpp
@@ -35,7 +35,7 @@ void Room638::init() {
case 607:
ws_demand_location(_G(my_walker), 670, 300, 9);
- ws_walk(615, 300, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 615, 300, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
@@ -45,7 +45,7 @@ void Room638::init() {
case 637:
ws_demand_location(_G(my_walker), -30, 319, 3);
- ws_walk(20, 319, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 20, 319, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room640.cpp b/engines/m4/riddle/rooms/section6/room640.cpp
index 5c6431afca9..2cf81c40adc 100644
--- a/engines/m4/riddle/rooms/section6/room640.cpp
+++ b/engines/m4/riddle/rooms/section6/room640.cpp
@@ -35,7 +35,7 @@ void Room640::init() {
case 607:
ws_demand_location(_G(my_walker), -30, 295, 3);
- ws_walk(32, 295, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 32, 295, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
@@ -45,7 +45,7 @@ void Room640::init() {
case 641:
ws_demand_location(_G(my_walker), 670, 335, 9);
- ws_walk(591, 335, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 591, 335, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room641.cpp b/engines/m4/riddle/rooms/section6/room641.cpp
index f2413e6e46d..e132aa27d1e 100644
--- a/engines/m4/riddle/rooms/section6/room641.cpp
+++ b/engines/m4/riddle/rooms/section6/room641.cpp
@@ -39,13 +39,13 @@ void Room641::init() {
case 640:
ws_demand_location(_G(my_walker), -30, 326, 3);
- ws_walk(24, 326, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 24, 326, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 642:
ws_demand_location(_G(my_walker), 670, 319, 9);
- ws_walk(614, 319, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 614, 319, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room642.cpp b/engines/m4/riddle/rooms/section6/room642.cpp
index 6279d92acb9..9fbe4387f2f 100644
--- a/engines/m4/riddle/rooms/section6/room642.cpp
+++ b/engines/m4/riddle/rooms/section6/room642.cpp
@@ -39,7 +39,7 @@ void Room642::init() {
case 641:
ws_demand_location(_G(my_walker), -30, 328, 3);
- ws_walk(32, 328, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 32, 328, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room643.cpp b/engines/m4/riddle/rooms/section6/room643.cpp
index 3ca757a4362..a17042ffc51 100644
--- a/engines/m4/riddle/rooms/section6/room643.cpp
+++ b/engines/m4/riddle/rooms/section6/room643.cpp
@@ -39,7 +39,7 @@ void Room643::init() {
case 644:
ws_demand_location(_G(my_walker), 670, 301, 9);
- ws_walk(615, 301, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 615, 301, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room644.cpp b/engines/m4/riddle/rooms/section6/room644.cpp
index ab14a3796cc..58191a2d345 100644
--- a/engines/m4/riddle/rooms/section6/room644.cpp
+++ b/engines/m4/riddle/rooms/section6/room644.cpp
@@ -40,13 +40,13 @@ void Room644::init() {
case 643:
ws_demand_location(_G(my_walker), -30, 313, 3);
- ws_walk(25, 313, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 25, 313, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 645:
ws_demand_location(_G(my_walker), 670, 346, 9);
- ws_walk(613, 346, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 613, 346, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room645.cpp b/engines/m4/riddle/rooms/section6/room645.cpp
index c27540601f5..6fce661d12d 100644
--- a/engines/m4/riddle/rooms/section6/room645.cpp
+++ b/engines/m4/riddle/rooms/section6/room645.cpp
@@ -39,13 +39,13 @@ void Room645::init() {
case 644:
ws_demand_location(_G(my_walker), -30, 323, 3);
- ws_walk(25, 323, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 25, 323, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 646:
ws_demand_location(_G(my_walker), 670, 298, 3);
- ws_walk(608, 298, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 608, 298, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room646.cpp b/engines/m4/riddle/rooms/section6/room646.cpp
index 041bf1218ee..131d17f3cda 100644
--- a/engines/m4/riddle/rooms/section6/room646.cpp
+++ b/engines/m4/riddle/rooms/section6/room646.cpp
@@ -39,13 +39,13 @@ void Room646::init() {
case 645:
ws_demand_location(_G(my_walker), -30, 330, 9);
- ws_walk(30, 330, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 30, 330, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
case 647:
ws_demand_location(_G(my_walker), 670, 292, 9);
- ws_walk(610, 292, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 610, 292, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room647.cpp b/engines/m4/riddle/rooms/section6/room647.cpp
index a08ea8923a4..8559a68f2ae 100644
--- a/engines/m4/riddle/rooms/section6/room647.cpp
+++ b/engines/m4/riddle/rooms/section6/room647.cpp
@@ -39,13 +39,13 @@ void Room647::init() {
case 646:
ws_demand_location(_G(my_walker), -30, 330, 3);
- ws_walk(30, 330, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 330, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
case 648:
ws_demand_location(_G(my_walker), 670, 307, 9);
- ws_walk(610, 307, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 610, 307, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room648.cpp b/engines/m4/riddle/rooms/section6/room648.cpp
index 3ea57f2c4b3..f3c4862814f 100644
--- a/engines/m4/riddle/rooms/section6/room648.cpp
+++ b/engines/m4/riddle/rooms/section6/room648.cpp
@@ -39,7 +39,7 @@ void Room648::init() {
case 647:
ws_demand_location(_G(my_walker), -30, 306, 3);
- ws_walk(30, 306, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 30, 306, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room650.cpp b/engines/m4/riddle/rooms/section6/room650.cpp
index ba292388d96..c27b4ccc29e 100644
--- a/engines/m4/riddle/rooms/section6/room650.cpp
+++ b/engines/m4/riddle/rooms/section6/room650.cpp
@@ -39,7 +39,7 @@ void Room650::init() {
case 651:
ws_demand_location(_G(my_walker), 670, 304, 9);
- ws_walk(615, 304, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 615, 304, nullptr, 1, 9);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section6/room651.cpp b/engines/m4/riddle/rooms/section6/room651.cpp
index 7cf5cfcb23e..752853277ae 100644
--- a/engines/m4/riddle/rooms/section6/room651.cpp
+++ b/engines/m4/riddle/rooms/section6/room651.cpp
@@ -43,7 +43,7 @@ void Room651::init() {
case 650:
ws_demand_location(_G(my_walker), -30, 310, 3);
- ws_walk(20, 310, nullptr, 1, 3);
+ ws_walk(_G(my_walker), 20, 310, nullptr, 1, 3);
player_set_commands_allowed(false);
break;
diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index 8c44a0cd2bc..4ba8eb94c06 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -165,12 +165,12 @@ void Room806::init() {
} else if (!_G(flags)[V265]) {
sendWSMessage_10000(_mcTrekMach, 225, 306, 3, 101, 1);
- ws_walk(221, 316, nullptr, 12001, 3, true);
+ ws_walk(_G(my_walker), 221, 316, nullptr, 12001, 3, true);
} else {
if (!_G(flags)[V276])
sendWSMessage_10000(_mcTrekMach, 225, 306, 3, -1, 1);
- ws_walk(221, 316, nullptr, 999, 3, true);
+ ws_walk(_G(my_walker), 221, 316, nullptr, 999, 3, true);
if (!_G(flags)[V276]) {
if (!player_been_here(809))
diff --git a/engines/m4/riddle/rooms/section8/room808.cpp b/engines/m4/riddle/rooms/section8/room808.cpp
index 93d9e9c406e..ec0c830afc5 100644
--- a/engines/m4/riddle/rooms/section8/room808.cpp
+++ b/engines/m4/riddle/rooms/section8/room808.cpp
@@ -1085,7 +1085,7 @@ void Room808::parser() {
} else if (_G(flags)[V097] == 1) {
if (inv_object_in_scene("FARMER'S SHOVEL", 808) &&
_G(flags)[V094] == 4)
- ws_walk(185, 156, nullptr, 11, 5);
+ ws_walk(_G(my_walker), 185, 156, nullptr, 11, 5);
else
digi_play("808r30", 1);
} else {
More information about the Scummvm-git-logs
mailing list