[Scummvm-git-logs] scummvm master -> d38f07bd7718cdb0711440c11f55037828dea7dd
Strangerke
noreply at scummvm.org
Wed Feb 12 23:19:45 UTC 2025
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c5c3573288 M4: RIDDLE: Fix calls to ws_walk in room group 4, 3 and 2 (WIP)
8f9d465dd6 M4: RIDDLE: Fix last calls to ws_walk in room group 2
d38f07bd77 M4: BURGER: Review call to ws_walk, replace 0 by nullptr for the null pointer to a buffer
Commit: c5c35732883f34b9b1f58eef588f9903afb147a1
https://github.com/scummvm/scummvm/commit/c5c35732883f34b9b1f58eef588f9903afb147a1
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-13T00:19:31+01:00
Commit Message:
M4: RIDDLE: Fix calls to ws_walk in room group 4, 3 and 2 (WIP)
Changed paths:
engines/m4/riddle/rooms/section2/room203.cpp
engines/m4/riddle/rooms/section3/room301.cpp
engines/m4/riddle/rooms/section3/room303.cpp
engines/m4/riddle/rooms/section3/room304.cpp
engines/m4/riddle/rooms/section3/room305.cpp
engines/m4/riddle/rooms/section3/room352.cpp
engines/m4/riddle/rooms/section4/room401.cpp
engines/m4/riddle/rooms/section4/room402.cpp
engines/m4/riddle/rooms/section4/room403.cpp
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index c09139e8cab..21aa7e8b289 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -2373,7 +2373,7 @@ void Room203::daemon() {
case 363:
ws_demand_location(_G(my_walker), 1100, 290, 9);
- ws_walk(1060, 290, nullptr, 364, 7);
+ ws_walk(_G(my_walker), 1060, 290, nullptr, 364, 7);
break;
case 364:
@@ -2381,7 +2381,7 @@ void Room203::daemon() {
ws_demand_facing(_official, 9);
setGlobals1(_officialTurn3_7, 1, 27, 27, 27);
sendWSMessage_110000(_official, 365);
- ws_walk(1062, 313, nullptr, 8888, 7);
+ ws_walk(_G(my_walker), 1062, 313, nullptr, 8888, 7);
break;
case 365:
@@ -2391,7 +2391,7 @@ void Room203::daemon() {
break;
case 366:
- ws_walk(280, 345, nullptr, 103, 9);
+ ws_walk(_G(my_walker), 280, 345, nullptr, 103, 9);
kernel_timing_trigger(50, 367);
break;
@@ -2476,7 +2476,7 @@ void Room203::daemon() {
break;
case 8888:
- ws_walk(940, 345, nullptr, -1, 7);
+ ws_walk(_G(my_walker), 940, 345, nullptr, -1, 7);
break;
case 9000:
@@ -2517,7 +2517,7 @@ void Room203::daemon() {
break;
case 9008:
- ws_walk(417, 240, nullptr, -1, 1);
+ ws_walk(_G(my_walker), 417, 240, nullptr, -1, 1);
kernel_timing_trigger(60, 9010);
break;
@@ -2583,7 +2583,7 @@ void Room203::pre_parser() {
if (lookFlag && player_said("ALLEY WALL") && _G(kernel).trigger == -1) {
_G(player).resetWalk();
_G(kernel).trigger_mode = KT_PARSE;
- ws_walk(710, 300, nullptr, 230, 11);
+ ws_walk(_G(my_walker), 710, 300, nullptr, 230, 11);
_G(kernel).trigger_mode = KT_PREPARSE;
}
}
@@ -2664,7 +2664,7 @@ void Room203::parser() {
kernel_timing_trigger(60, 7);
break;
case 3:
- ws_walk(400, 252, nullptr, 5, 1);
+ ws_walk(_G(my_walker), 400, 252, nullptr, 5, 1);
break;
case 5:
disable_player_commands_and_fade_init(6);
@@ -3054,7 +3054,7 @@ void Room203::parser() {
case 4:
inv_move_object("SOLDIER'S HELMET", 203);
player_update_info();
- ws_walk(_G(player_info).x + 65, _G(player_info).y + 10, nullptr, -1, 10);
+ ws_walk(_G(my_walker), _G(player_info).x + 65, _G(player_info).y + 10, nullptr, -1, 10);
_val1 = 1;
if (_peasantMode == 4050) {
@@ -3305,9 +3305,9 @@ void Room203::peasantWalk() {
_G(player_info).x > 735 && _G(player_info).x < 1140) {
if (_G(player_info).facing == 1 || _G(player_info).facing == 2 ||
_G(player_info).facing == 10 || _G(player_info).facing == 11)
- ws_walk(_G(player_info).x, 294, nullptr, -1, 0);
+ ws_walk(_G(my_walker), _G(player_info).x, 294, nullptr, -1, 0);
else
- ws_walk(_G(player_info).x, 350, nullptr, -1, 0);
+ ws_walk(_G(my_walker), _G(player_info).x, 350, nullptr, -1, 0);
}
break;
@@ -3315,7 +3315,7 @@ void Room203::peasantWalk() {
case 4175:
if (_G(player_info).y > 315 && _G(player_info).y < 335 &&
_G(player_info).x > 373 && _G(player_info).x < 763) {
- ws_walk(_G(player_info).x, 350, nullptr, -1, 0);
+ ws_walk(_G(my_walker), _G(player_info).x, 350, nullptr, -1, 0);
}
break;
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index c1af472b1be..c224a71add6 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -81,13 +81,13 @@ void Room301::init() {
ws_demand_location(_G(my_walker), 55, 270, 3);
if (_val12 || (!player_been_here(401) && _G(flags)[V092] && !_G(flags)[V093])) {
- ws_walk(352, 269, nullptr, 60, 3);
+ ws_walk(_G(my_walker), 352, 269, nullptr, 60, 3);
} else if (!player_been_here(301)) {
digi_preload("301r37");
digi_play("301r37", 1, 255, 51);
- ws_walk(165, 270, nullptr, -1, 3);
+ ws_walk(_G(my_walker), 165, 270, nullptr, -1, 3);
} else {
- ws_walk(165, 270, nullptr, 51, 3);
+ ws_walk(_G(my_walker), 165, 270, nullptr, 51, 3);
}
}
@@ -892,7 +892,7 @@ void Room301::parser() {
_marshalMatt = series_load("marshall matt");
digi_preload("301s01");
_ripTrekArms = series_load("rip trek arms x pos3");
- ws_walk(200, 269, nullptr, 1, 9);
+ ws_walk(_G(my_walker), 200, 269, nullptr, 1, 9);
} else if (_G(kernel).trigger == 1) {
_G(kernel).trigger_mode = KT_DAEMON;
_machine2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
@@ -935,7 +935,7 @@ void Room301::parser() {
break;
case 1:
player_update_info();
- ws_walk(_G(player_info).x, _G(player_info).y,
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y,
nullptr, 2, 3);
break;
case 2:
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 24952be3020..abc265c1ddc 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -320,7 +320,7 @@ void Room303::daemon() {
break;
case 6:
- ws_walk(128, 267, nullptr, 75, 3);
+ ws_walk(_G(my_walker), 128, 267, nullptr, 75, 3);
break;
case 7:
@@ -329,18 +329,18 @@ void Room303::daemon() {
break;
case 8:
- ws_walk(145, 289, nullptr, -1, 2);
+ ws_walk(_G(my_walker), 145, 289, nullptr, -1, 2);
kernel_timing_trigger(200, 38);
break;
case 9:
ws_demand_location(_G(my_walker), 1350, 276, 9);
- ws_walk(1208, 276, nullptr, 75, 9);
+ ws_walk(_G(my_walker), 1208, 276, nullptr, 75, 9);
break;
case 10:
ws_demand_location(_G(my_walker), 425, 227, 7);
- ws_walk(399, 260, nullptr, 50, 7);
+ ws_walk(_G(my_walker), 399, 260, nullptr, 50, 7);
break;
case 18:
@@ -453,7 +453,7 @@ void Room303::daemon() {
break;
case 107:
- ws_walk(700, 305, 0, -1, 3);
+ ws_walk(_G(my_walker), 700, 305, 0, -1, 3);
sendWSMessage_10000(_mei, 393, 260, 9, 109, 0);
break;
@@ -481,7 +481,7 @@ void Room303::daemon() {
kernel_timing_trigger(60, 103);
series_unload(_suitTalk1);
series_unload(_chinTalk4);
- ws_walk(700, 305, nullptr, -1, 3);
+ ws_walk(_G(my_walker), 700, 305, nullptr, -1, 3);
break;
case 117:
@@ -492,7 +492,7 @@ void Room303::daemon() {
break;
case 118:
- ws_walk(444, 295, nullptr, 119, 10);
+ ws_walk(_G(my_walker), 444, 295, nullptr, 119, 10);
break;
case 119:
@@ -516,7 +516,7 @@ void Room303::daemon() {
case 122:
series_unload(_chinTalk4);
player_update_info();
- ws_walk(_G(player_info).x + 1, _G(player_info).y - 1,
+ ws_walk(_G(my_walker), _G(player_info).x + 1, _G(player_info).y - 1,
nullptr, 123, 1);
break;
@@ -547,7 +547,7 @@ void Room303::daemon() {
break;
case 127:
- ws_walk(_G(player_info).x + 50, _G(player_info).y + 10,
+ ws_walk(_G(my_walker), _G(player_info).x + 50, _G(player_info).y + 10,
nullptr, -1, 10);
break;
@@ -568,7 +568,7 @@ void Room303::daemon() {
break;
case 132:
- ws_walk(565, 306, nullptr, 170, 10);
+ ws_walk(_G(my_walker), 565, 306, nullptr, 170, 10);
kernel_timing_trigger(1, 133);
break;
@@ -597,7 +597,7 @@ void Room303::daemon() {
case 138:
series_unload(_chinTalk4);
- ws_walk(500, 300, nullptr, 125, 3);
+ ws_walk(_G(my_walker), 500, 300, nullptr, 125, 3);
break;
case 143:
@@ -674,7 +674,7 @@ void Room303::daemon() {
break;
case 198:
- ws_walk(444, 295, nullptr, 111, 11);
+ ws_walk(_G(my_walker), 444, 295, nullptr, 111, 11);
break;
case 200:
@@ -1496,7 +1496,7 @@ void Room303::parser() {
if (player_been_here(301)) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(409, 266, nullptr, 1, 1);
+ ws_walk(_G(my_walker), 409, 266, nullptr, 1, 1);
break;
case 1:
@@ -1518,7 +1518,7 @@ void Room303::parser() {
break;
case 4:
- ws_walk(417, 232, nullptr, -1, 2);
+ ws_walk(_G(my_walker), 417, 232, nullptr, -1, 2);
break;
case 5:
@@ -1554,7 +1554,7 @@ void Room303::parser() {
break;
case 4:
- ws_walk(417, 232, nullptr, -1, 2);
+ ws_walk(_G(my_walker), 417, 232, nullptr, -1, 2);
disable_player_commands_and_fade_init(6);
break;
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 1137ee60b5f..238dd164905 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -132,7 +132,7 @@ void Room304::init() {
void Room304::daemon() {
switch (_G(kernel).trigger) {
case 49:
- ws_walk(387, 292, nullptr, 50, 9);
+ ws_walk(_G(my_walker), 387, 292, nullptr, 50, 9);
digi_play("304m01", 1, 255, 60);
break;
@@ -141,7 +141,7 @@ void Room304::daemon() {
break;
case 51:
- ws_walk(431, 287, nullptr, 50, 8);
+ ws_walk(_G(my_walker), 431, 287, nullptr, 50, 8);
break;
case 60:
@@ -638,7 +638,7 @@ void Room304::handlingStickAndSword() {
series_unload(_suit1);
_safe1 = series_load("rip opens safe part 1");
_safe2 = series_load("rip opens safe part 2");
- ws_walk(510, 300, nullptr, 43, 3);
+ ws_walk(_G(my_walker), 510, 300, nullptr, 43, 3);
digi_preload("304r51");
digi_play("304r51", 1, 255, 79);
break;
@@ -684,7 +684,7 @@ void Room304::handlingStickAndSword() {
_safe1 = series_load("one frame safe open");
series_show_sprite("one frame safe open", 0, 0xa00);
_suit3 = series_load("mc hand to chin pos3");
- ws_walk(260, 279, nullptr, 80, 8);
+ ws_walk(_G(my_walker), 260, 279, nullptr, 80, 8);
break;
case 51:
@@ -783,7 +783,7 @@ void Room304::handlingStickAndSword() {
break;
case 69:
- ws_walk(458, 263, nullptr, -1, 2);
+ ws_walk(_G(my_walker), 458, 263, nullptr, -1, 2);
kernel_timing_trigger(30, 678);
break;
diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 3e899764b52..20acac84487 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -260,7 +260,7 @@ void Room305::daemon() {
break;
case 10:
- ws_walk(1220, 296, 0, 50, 9);
+ ws_walk(_G(my_walker), 1220, 296, nullptr, 50, 9);
break;
case 40:
@@ -760,7 +760,7 @@ next2:
(takeFlag && inv_object_is_here(_G(player).noun))) {
if (chiselFlag) {
if (player_said("CHISEL")) {
- ws_walk(186, 279, 0, 1, 10);
+ ws_walk(_G(my_walker), 186, 279, 0, 1, 10);
}
} else {
kernel_timing_trigger(1, 1);
@@ -819,15 +819,15 @@ next3:
(takeFlag && inv_object_is_here(_G(player).noun))) {
if (caseFlag) {
if (player_said("GERMAN BANKNOTE"))
- ws_walk(88, 305, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 88, 305, nullptr, 1, 10);
else if (player_said("REBUS AMULET"))
- ws_walk(66, 319, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 66, 319, nullptr, 1, 10);
else if (player_said("SILVER BUTTERFLY"))
- ws_walk(124, 302, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 124, 302, nullptr, 1, 10);
else if (player_said("POSTAGE STAMP"))
- ws_walk(164, 288, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 164, 288, nullptr, 1, 10);
else if (player_said("STICK AND SHELL MAP"))
- ws_walk(120, 299, nullptr, 1, 10);
+ ws_walk(_G(my_walker), 120, 299, nullptr, 1, 10);
} else {
kernel_timing_trigger(1, 1);
}
@@ -1277,26 +1277,26 @@ void Room305::conv305a() {
bool Room305::walkToObject() {
if (player_said("SHRUNKEN HEAD")) {
- ws_walk(98, 313, 0, 1, 10, 1);
+ ws_walk(_G(my_walker), 98, 313, nullptr, 1, 10, true);
return true;
} else if (player_said("INCENSE BURNER")) {
- ws_walk(171, 285, 0, 1, 10, 1);
+ ws_walk(_G(my_walker), 171, 285, nullptr, 1, 10, true);
return true;
} else if (player_said("CRYSTAL SKULL")) {
- ws_walk(70, 320, 0, 1, 10, 1);
+ ws_walk(_G(my_walker), 70, 320, nullptr, 1, 10, true);
return true;
} else if (player_said("WHALE BONE HORN")) {
- ws_walk(116, 304, 0, 1, 10, 1);
+ ws_walk(_G(my_walker), 116, 304, nullptr, 1, 10, true);
return true;
} else if (player_said("WHEELED TOY")) {
- ws_walk(151, 296, 0, 1, 10, 1);
+ ws_walk(_G(my_walker), 151, 296, nullptr, 1, 10, true);
return true;
} else if (player_said("ROMANOV EMERALD")) {
if (_G(flags)[V090] == 3) {
digi_play("305f08", 1, 255, 6);
_fengShould = 2;
} else {
- ws_walk(183, 288, 0, 1, 10, 1);
+ ws_walk(_G(my_walker), 183, 288, nullptr, 1, 10, true);
}
return true;
}
diff --git a/engines/m4/riddle/rooms/section3/room352.cpp b/engines/m4/riddle/rooms/section3/room352.cpp
index 811d1baefb4..ac24c3d6f5e 100644
--- a/engines/m4/riddle/rooms/section3/room352.cpp
+++ b/engines/m4/riddle/rooms/section3/room352.cpp
@@ -96,7 +96,7 @@ void Room352::daemon() {
_meiChecksShoe = series_stream("mei checks her shoe", 7, 0, -1);
series_stream_break_on_frame(_meiChecksShoe, 47, 17);
ws_unhide_walker();
- ws_walk(319, 301, nullptr, 20, 1);
+ ws_walk(_G(my_walker), 319, 301, nullptr, 20, 1);
break;
case 17:
diff --git a/engines/m4/riddle/rooms/section4/room401.cpp b/engines/m4/riddle/rooms/section4/room401.cpp
index 038d80c7b10..6d841357d66 100644
--- a/engines/m4/riddle/rooms/section4/room401.cpp
+++ b/engines/m4/riddle/rooms/section4/room401.cpp
@@ -90,9 +90,9 @@ void Room401::init() {
(_G(flags)[V017] && player_been_here(407) && !_G(flags)[V019]) ||
(_G(flags)[kWolfFled] && !_G(flags)[V091])
) {
- ws_walk(346, 267, 0, 7, 3, 1);
+ ws_walk(_G(my_walker), 346, 267, nullptr, 7, 3, true);
} else {
- ws_walk(158, 266, 0, 7, 3, 1);
+ ws_walk(_G(my_walker), 158, 266, nullptr, 7, 3, true);
}
}
@@ -864,8 +864,7 @@ void Room401::parser() {
break;
case 1:
player_update_info();
- ws_walk(_G(player_info).x + 1, _G(player_info).y,
- nullptr, 2, 3);
+ ws_walk(_G(my_walker), _G(player_info).x + 1, _G(player_info).y, nullptr, 2, 3);
_agentShould = 4;
break;
case 2:
diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index e069a79ebc1..d5a30c7712e 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -149,13 +149,13 @@ void Room402::init() {
case 408:
ws_demand_location(_G(my_walker), 517, 239, 3);
- ws_walk(510, 260, nullptr, 50, 8);
+ ws_walk(_G(my_walker), 510, 260, nullptr, 50, 8);
break;
default:
digi_preload("950_s22");
ws_demand_location(_G(my_walker), 660, 290, 3);
- ws_walk(612, 287, nullptr, 50, 9);
+ ws_walk(_G(my_walker), 612, 287, nullptr, 50, 9);
midi_fade_volume(0, 120);
break;
}
@@ -226,7 +226,7 @@ void Room402::init() {
sendWSMessage_10000(1, _wolfieMach, _wolfClipping, 1, 10, 110,
_wolfClipping, 10, 10, 0);
ws_demand_location(_G(my_walker), 517, 239, 3);
- ws_walk(503, 248, nullptr, 350, 7);
+ ws_walk(_G(my_walker), 503, 248, nullptr, 350, 7);
} else if (_G(flags)[V117] != 0 && inv_player_has("TURTLE")) {
_G(flags)[V117] = 0;
hotspot_set_active("TOPIARY ", true);
@@ -239,14 +239,14 @@ void Room402::init() {
kernel_timing_trigger(90, 40);
} else {
ws_demand_location(_G(my_walker), 517, 239, 3);
- ws_walk(449, 317, nullptr, 30, 3);
+ ws_walk(_G(my_walker), 449, 317, nullptr, 30, 3);
}
break;
default:
digi_preload("950_s22");
ws_demand_location(_G(my_walker), 660, 290, 3);
- ws_walk(449, 317, nullptr, 30, 3);
+ ws_walk(_G(my_walker), 449, 317, nullptr, 30, 3);
midi_fade_volume(0, 120);
if (inv_player_has("TURTLE"))
@@ -266,7 +266,7 @@ void Room402::init() {
sendWSMessage_10000(1, _wolfieMach, _wolfClipping, 1, 10, 110,
_wolfClipping, 10, 10, 0);
ws_demand_location(_G(my_walker), 517, 239, 3);
- ws_walk(510, 260, nullptr, 370, 8);
+ ws_walk(_G(my_walker), 510, 260, nullptr, 370, 8);
}
digi_play_loop("950_s22", 3, 120);
@@ -277,7 +277,7 @@ void Room402::daemon() {
switch (_G(kernel).trigger) {
case 19:
- ws_walk(449, 317, nullptr, 20, 3);
+ ws_walk(_G(my_walker), 449, 317, nullptr, 20, 3);
midi_fade_volume(0, 120);
break;
@@ -362,7 +362,7 @@ void Room402::daemon() {
break;
case 40:
- ws_walk(510, 260, nullptr, -1, 8);
+ ws_walk(_G(my_walker), 510, 260, nullptr, -1, 8);
break;
case 42:
@@ -379,13 +379,13 @@ void Room402::daemon() {
series_unload(_ripDownStairs);
ws_unhide_walker();
ws_demand_location(_G(my_walker), 345, 275, 3);
- ws_walk(375, 279, nullptr,
+ ws_walk(_G(my_walker), 375, 279, nullptr,
(_G(flags)[kWolfLocation] == 402) ? 56 : 50,
4);
break;
case 56:
- ws_walk(449, 317, nullptr, 30, 3);
+ ws_walk(_G(my_walker), 449, 317, nullptr, 30, 3);
break;
case 100:
@@ -1278,7 +1278,7 @@ void Room402::daemon() {
terminateMachineAndNull(_safariShadow);
ws_unhide_walker();
_G(flags)[V114] = 0;
- ws_walk(517, 239, nullptr, -1, 9);
+ ws_walk(_G(my_walker), 517, 239, nullptr, -1, 9);
kernel_timing_trigger(60, 304);
break;
@@ -1361,7 +1361,7 @@ void Room402::daemon() {
case 372:
digi_play("402r07", 1);
- ws_walk(517, 239, nullptr, -1, 9);
+ ws_walk(_G(my_walker), 517, 239, nullptr, -1, 9);
kernel_timing_trigger(90, 373);
break;
@@ -1508,7 +1508,7 @@ void Room402::parser() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- ws_walk(517, 239, nullptr, 2, 11);
+ ws_walk(_G(my_walker), 517, 239, nullptr, 2, 11);
break;
case 2:
disable_player_commands_and_fade_init(3);
@@ -1544,7 +1544,7 @@ void Room402::parser() {
if (_G(flags)[kCastleCartoon])
digi_play("com016", 1);
else if (_G(kernel).trigger == -1)
- ws_walk(190, 333, nullptr, 8, 2);
+ ws_walk(_G(my_walker), 190, 333, nullptr, 8, 2);
else {
if (_G(kernel).trigger == 6) {
_G(flags)[kCastleCartoon] = 1;
diff --git a/engines/m4/riddle/rooms/section4/room403.cpp b/engines/m4/riddle/rooms/section4/room403.cpp
index 4a6275416f3..69c021150a4 100644
--- a/engines/m4/riddle/rooms/section4/room403.cpp
+++ b/engines/m4/riddle/rooms/section4/room403.cpp
@@ -104,7 +104,7 @@ void Room403::init() {
MoveScreenDelta(-640, 0);
ws_demand_location(_G(my_walker), 1172, 322, 3);
- ws_walk(1172, 322, nullptr, 400, 1);
+ ws_walk(_G(my_walker), 1172, 322, nullptr, 400, 1);
} else if (_G(flags)[V139] == 4) {
_G(flags)[V139] = 0;
@@ -112,7 +112,7 @@ void Room403::init() {
hotspot_set_active("STEP LADDER ", true);
MoveScreenDelta(-640, 0);
ws_demand_location(_G(my_walker), 1083, 322, 3);
- ws_walk(1201, 321, nullptr, 420, 2);
+ ws_walk(_G(my_walker), 1201, 321, nullptr, 420, 2);
} else {
if (inv_player_has("TURTLE"))
@@ -250,7 +250,7 @@ void Room403::init() {
player_set_commands_allowed(true);
} else {
ws_demand_location(_G(my_walker), 4, 296);
- ws_walk(80, 300, nullptr, 300, 3);
+ ws_walk(_G(my_walker), 80, 300, nullptr, 300, 3);
}
}
}
@@ -1252,7 +1252,7 @@ void Room403::daemon() {
break;
case 311:
- ws_walk(1120, 328, nullptr, 314, 1);
+ ws_walk(_G(my_walker), 1120, 328, nullptr, 314, 1);
break;
case 312:
Commit: 8f9d465dd6d28416bce8a32285f5979edda1343a
https://github.com/scummvm/scummvm/commit/8f9d465dd6d28416bce8a32285f5979edda1343a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-13T00:19:31+01:00
Commit Message:
M4: RIDDLE: Fix last calls to ws_walk in room group 2
Changed paths:
engines/m4/riddle/rooms/section2/room201.cpp
engines/m4/riddle/rooms/section2/room203.cpp
diff --git a/engines/m4/riddle/rooms/section2/room201.cpp b/engines/m4/riddle/rooms/section2/room201.cpp
index 28220cdedd4..3521de355a4 100644
--- a/engines/m4/riddle/rooms/section2/room201.cpp
+++ b/engines/m4/riddle/rooms/section2/room201.cpp
@@ -155,7 +155,7 @@ void Room201::init() {
if (_G(flags)[V053] > 0) {
hotspot_set_active("MEI CHEN", false);
- ws_walk(356, 256, nullptr, 1000, 3);
+ ws_walk(_G(my_walker), 356, 256, nullptr, 1000, 3);
_G(flags)[V068] = 1;
if (_G(flags)[V053] == 1)
@@ -184,7 +184,7 @@ void Room201::daemon() {
break;
case 75:
- ws_walk(237, 247, nullptr, 205, 10);
+ ws_walk(_G(my_walker), 237, 247, nullptr, 205, 10);
break;
case 100:
@@ -394,7 +394,7 @@ void Room201::daemon() {
case 235:
player_update_info();
- ws_walk(_G(player_info).x, _G(player_info).y, nullptr, 240, 3);
+ ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 240, 3);
break;
case 240:
@@ -435,7 +435,7 @@ void Room201::daemon() {
case 279:
_meiShould = 2;
- ws_walk(356, 256, nullptr, 280, 3);
+ ws_walk(_G(my_walker), 356, 256, nullptr, 280, 3);
break;
case 280:
@@ -1673,7 +1673,7 @@ void Room201::parser() {
} else if (player_said("walk through")) {
switch (_G(kernel).trigger) {
case -1:
- ws_walk(66, 254, nullptr, 2, 7);
+ ws_walk(_G(my_walker), 66, 254, nullptr, 2, 7);
break;
case 2:
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index 21aa7e8b289..bd751a3e530 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -182,7 +182,7 @@ void Room203::init() {
hotspot_set_active("SOLDIER'S HELMET", false);
kernel_timing_trigger(1, 130);
ws_demand_location(_G(my_walker), 348, 273, 1);
- ws_walk(231, 331, nullptr, 303, 4);
+ ws_walk(_G(my_walker), 231, 331, nullptr, 303, 4);
break;
case 207:
@@ -237,7 +237,7 @@ void Room203::init() {
} else {
ws_demand_location(_G(my_walker), 1055, 295, 7);
- ws_walk(1045, 345, nullptr, 303, 7);
+ ws_walk(_G(my_walker), 1045, 345, nullptr, 303, 7);
kernel_timing_trigger(1, 300);
}
break;
@@ -273,7 +273,7 @@ void Room203::init() {
_mei = triggerMachineByHash_3000(8, 4, *S2_MEI_NORMAL_DIRS, *S2_MEI_SHADOW_DIRS,
-95, 352, 3, triggerMachineByHashCallback3000, "mc");
- ws_walk(196, 335, nullptr, 9000, 3);
+ ws_walk(_G(my_walker), 196, 335, nullptr, 9000, 3);
sendWSMessage_10000(_mei, 173, 344, 3, -1, 1);
_G(player).disable_hyperwalk = true;
@@ -299,7 +299,7 @@ void Room203::init() {
setupPigeons();
setupOfficial();
kernel_timing_trigger(1, 130);
- ws_walk(115, 353, nullptr, 371, 3);
+ ws_walk(_G(my_walker), 115, 353, nullptr, 371, 3);
} else {
_ripLooksAtHeads = series_load("rip looks at heads pos2");
@@ -341,7 +341,7 @@ void Room203::daemon() {
break;
case 4:
- ws_walk(115, 353, nullptr, 5, 3);
+ ws_walk(_G(my_walker), 115, 353, nullptr, 5, 3);
break;
case 5:
@@ -419,11 +419,11 @@ void Room203::daemon() {
case 15:
sendWSMessage_150000(-1);
- ws_walk(315, 353, nullptr, 16);
+ ws_walk(_G(my_walker), 315, 353, nullptr, 16, -1);
break;
case 16:
- ws_walk(350, 328, nullptr, 17, 10);
+ ws_walk(_G(my_walker), 350, 328, nullptr, 17, 10);
break;
case 17:
@@ -809,7 +809,7 @@ void Room203::daemon() {
break;
case 98:
- 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);
terminateMachineAndNull(_official);
terminateMachineAndNull(_officialShadow);
ws_walk_load_shadow_series(OFFICIAL_SHADOW_DIRS, OFFICIAL_SHADOW_NAMES);
@@ -828,12 +828,12 @@ void Room203::daemon() {
case 100:
sendWSMessage_120000(_official, -1);
- ws_walk(656, 335, nullptr, 101, 9);
+ ws_walk(_G(my_walker), 656, 335, nullptr, 101, 9);
break;
case 101:
sendWSMessage_130000(_official, 102);
- ws_walk(280, 345, nullptr, 103, 9);
+ ws_walk(_G(my_walker), 280, 345, nullptr, 103, 9);
break;
case 102:
@@ -869,7 +869,7 @@ void Room203::daemon() {
case 108:
sendWSMessage_150000(-1);
- ws_walk(-30, 355, nullptr, -1);
+ ws_walk(_G(my_walker), -30, 355, nullptr, -1, -1);
kernel_timing_trigger(40, 109);
break;
Commit: d38f07bd7718cdb0711440c11f55037828dea7dd
https://github.com/scummvm/scummvm/commit/d38f07bd7718cdb0711440c11f55037828dea7dd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-13T00:19:31+01:00
Commit Message:
M4: BURGER: Review call to ws_walk, replace 0 by nullptr for the null pointer to a buffer
Changed paths:
engines/m4/burger/rooms/section1/room102.cpp
engines/m4/burger/rooms/section1/room103.cpp
engines/m4/burger/rooms/section1/room104.cpp
engines/m4/burger/rooms/section1/room105.cpp
engines/m4/burger/rooms/section1/room133_136.cpp
engines/m4/burger/rooms/section1/room137.cpp
engines/m4/burger/rooms/section1/room139_144.cpp
engines/m4/burger/rooms/section1/room142.cpp
engines/m4/burger/rooms/section1/room143.cpp
engines/m4/burger/rooms/section1/room145.cpp
engines/m4/burger/rooms/section1/room170.cpp
engines/m4/burger/rooms/section1/room171.cpp
engines/m4/burger/rooms/section3/room303.cpp
engines/m4/burger/rooms/section4/room402.cpp
engines/m4/burger/rooms/section5/room502.cpp
engines/m4/burger/rooms/section5/room503.cpp
engines/m4/burger/rooms/section6/room602.cpp
engines/m4/burger/rooms/section6/room604.cpp
engines/m4/burger/rooms/section7/room702.cpp
diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index 2a24e3312f7..2c78b832430 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -54,7 +54,7 @@ static const seriesStreamBreak STREAMS3[] = {
};
static const seriesStreamBreak STREAMS4[] = {
- { 6,"102_035", 2, 255, -1, 0, 0, 0 },
+ { 6,"102_035", 2, 255, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -98,7 +98,7 @@ static const seriesPlayBreak PLAY4[] = {
void Room102::init() {
_val1 = 0;
- _series3 = 0;
+ _series3 = nullptr;
_val3 = -1;
_val4 = 0;
_val5 = 0;
@@ -461,7 +461,7 @@ void Room102::daemon() {
if (++_val5 > 24 && _val5 != -666 && player_commands_allowed()) {
_val5 = -666;
- conv_load_and_prepare("conv05", 20, 0);
+ conv_load_and_prepare("conv05", 20, false);
conv_export_pointer_curr(&_G(flags)[V016], 0);
conv_play_curr();
}
@@ -833,7 +833,7 @@ void Room102::daemon() {
case 12:
series_set_frame_rate(_stream1, 30000);
- ws_walk(324, 341, 0, 13, 10, 1);
+ ws_walk(324, 341, nullptr, 13, 10, true);
break;
case 13:
@@ -856,7 +856,7 @@ void Room102::daemon() {
break;
case 16:
- ws_walk(318, 343, 0, -1, 2, 1);
+ ws_walk(318, 343, nullptr, -1, 2, 1);
break;
case 17:
@@ -961,7 +961,7 @@ void Room102::daemon() {
ws_demand_location(628, 325);
ws_demand_facing(9);
_G(wilbur_should) = 2;
- ws_walk(435, 329, 0, kCHANGE_WILBUR_ANIMATION, 9);
+ ws_walk(435, 329, nullptr, kCHANGE_WILBUR_ANIMATION, 9);
break;
case 2:
@@ -1507,7 +1507,7 @@ void Room102::conv04() {
_harryMode = 26;
kernel_trigger_dispatch_now(kCHANGE_HARRY_ANIMATION);
player_update_info();
- ws_walk(192, 327, 0, -1, 4);
+ ws_walk(192, 327, nullptr, -1, 4);
conv_resume_curr();
} else if (node == 4 && entry == 0) {
@@ -1551,7 +1551,7 @@ void Room102::conv04() {
player_update_info();
if (_G(player).walker_visible && _G(player_info).facing != 2) {
- ws_walk(192, 327, 0, 7, 2);
+ ws_walk(192, 327, nullptr, 7, 2);
} else if (node == 4 && entry == 1) {
digi_preload("04p0502", 102);
digi_play(sound, 1, 255, 22);
diff --git a/engines/m4/burger/rooms/section1/room103.cpp b/engines/m4/burger/rooms/section1/room103.cpp
index 41b2aaa634e..eab7ce29a95 100644
--- a/engines/m4/burger/rooms/section1/room103.cpp
+++ b/engines/m4/burger/rooms/section1/room103.cpp
@@ -78,18 +78,18 @@ static const seriesPlayBreak PLAY1[] = {
};
static const seriesPlayBreak PLAY2[] = {
- { 0, 0, "103_002", 2, 100, -1, 0, 0, 0, 0 },
- { 1, 1, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 2, 2, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 1, 1, "103_002", 2, 100, -1, 0, 0, 0, 0 },
- { 0, 0, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 1, 1, "103_002", 2, 100, -1, 0, 0, 0, 0 },
- { 0, 0, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 1, 1, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 2, 2, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 1, 1, "103_002", 2, 100, -1, 0, 0, 0, 0 },
- { 0, 0, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 1, 1, nullptr, 1, 255, -1, 0, 0, 0, 0 },
+ { 0, 0, "103_002", 2, 100, -1, 0, 0, nullptr, 0 },
+ { 1, 1, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 2, 2, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 1, 1, "103_002", 2, 100, -1, 0, 0, nullptr, 0 },
+ { 0, 0, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 1, 1, "103_002", 2, 100, -1, 0, 0, nullptr, 0 },
+ { 0, 0, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 1, 1, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 2, 2, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 1, 1, "103_002", 2, 100, -1, 0, 0, nullptr, 0 },
+ { 0, 0, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 1, 1, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -246,7 +246,7 @@ void Room103::daemon() {
(_G(player_info).x > 490 && _G(player_info).y < 374) ||
(_G(player_info).x > 215 && _G(player_info).y < 267) ||
(_G(player_info).y < 224)) {
- ws_walk(271, 265, 0, 19, 2);
+ ws_walk(271, 265, nullptr, 19, 2);
term_message("walk to caught");
} else {
@@ -483,7 +483,7 @@ void Room103::daemon() {
_G(flags)[kHarryComingToRoof] = 0;
_G(wilbur_should) = 6;
_G(flags)[kDisableFootsteps] = 0;
- ws_walk(325, 173, 0, 10016);
+ ws_walk(325, 173, nullptr, 10016);
break;
case 19:
@@ -547,7 +547,7 @@ void Room103::daemon() {
_G(flags)[V009] = _G(flags).get_boonsville_time_and_display() + 1800;
_G(flags)[V012] = 2;
- ws_walk(271, 265, 0, 24, 2);
+ ws_walk(271, 265, nullptr, 24, 2);
break;
case 24:
diff --git a/engines/m4/burger/rooms/section1/room104.cpp b/engines/m4/burger/rooms/section1/room104.cpp
index 49bf0f983fc..7c38f258312 100644
--- a/engines/m4/burger/rooms/section1/room104.cpp
+++ b/engines/m4/burger/rooms/section1/room104.cpp
@@ -418,12 +418,12 @@ void Room104::daemon() {
case 1:
ws_demand_location(315, 373);
ws_demand_facing(10);
- ws_walk(271, 348, 0, -1, 10);
+ ws_walk(271, 348, nullptr, -1, 10);
break;
case 2:
ws_demand_location(208, 243);
ws_demand_facing(7);
- ws_walk(180, 287, 0, -1, 7);
+ ws_walk(180, 287, nullptr, -1, 7);
break;
case 3:
ws_demand_location(417, 361);
diff --git a/engines/m4/burger/rooms/section1/room105.cpp b/engines/m4/burger/rooms/section1/room105.cpp
index afb5c6bf7c4..35370c6b101 100644
--- a/engines/m4/burger/rooms/section1/room105.cpp
+++ b/engines/m4/burger/rooms/section1/room105.cpp
@@ -1065,7 +1065,7 @@ void Room105::daemon() {
break;
case 11:
- ws_walk(186, 263, 0, -1, 10);
+ ws_walk(186, 263, nullptr, -1, 10);
break;
case 12:
@@ -1073,7 +1073,7 @@ void Room105::daemon() {
break;
case 13:
- ws_walk(415, 254, 0, -1, 2);
+ ws_walk(415, 254, nullptr, -1, 2);
break;
case 15:
@@ -1158,7 +1158,7 @@ void Room105::daemon() {
break;
case 24:
- ws_walk(385, 254, 0, -1, 2);
+ ws_walk(385, 254, nullptr, -1, 2);
break;
case 25:
@@ -1297,10 +1297,10 @@ void Room105::daemon() {
if (_G(flags)[kPerkinsLostIsland] && !_G(flags)[V034]) {
player_set_commands_allowed(false);
_G(flags)[V034] = 1;
- ws_walk(199, 279, 0, 19, 9);
+ ws_walk(199, 279, nullptr, 19, 9);
} else {
- ws_walk(301, 313, 0, -1, 11);
+ ws_walk(301, 313, nullptr, -1, 11);
}
break;
diff --git a/engines/m4/burger/rooms/section1/room133_136.cpp b/engines/m4/burger/rooms/section1/room133_136.cpp
index 16d09ff15e2..6d55f8e7f01 100644
--- a/engines/m4/burger/rooms/section1/room133_136.cpp
+++ b/engines/m4/burger/rooms/section1/room133_136.cpp
@@ -38,18 +38,18 @@ static const char *SAID[][4] = {
};
static const seriesPlayBreak PLAY1[] = {
- { 0, 12, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 13, 30, "136_002", 2, 255, -1, 0, 0, 0, 0 },
- { 31, 57, "136_002", 2, 255, -1, 0, 0, 0, 0 },
- { 58, -1, nullptr, 2, 255, -1, 2048, 0, 0, 0 },
- { -1, -1, nullptr, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, 12, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 13, 30, "136_002", 2, 255, -1, 0, 0, nullptr, 0 },
+ { 31, 57, "136_002", 2, 255, -1, 0, 0, nullptr, 0 },
+ { 58, -1, nullptr, 2, 255, -1, 2048, 0, nullptr, 0 },
+ { -1, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
static const seriesStreamBreak SERIES1[] = {
- { 6, nullptr, 2, 255, 9, 0, 0, 0 },
- { 10, "100_022", 2, 255, -1, 0, 0, 0 },
- { -1, nullptr, 0, 0, -1, 0, 0, 0 },
+ { 6, nullptr, 2, 255, 9, 0, nullptr, 0 },
+ { 10, "100_022", 2, 255, -1, 0, nullptr, 0 },
+ { -1, nullptr, 0, 0, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -101,8 +101,6 @@ void Room133_136::init() {
}
void Room133_136::daemon() {
- int frame;
-
if (player_commands_allowed() && _G(player).walker_visible) {
player_update_info();
@@ -129,10 +127,10 @@ void Room133_136::daemon() {
case 3:
if (_val1 == 1) {
- frame = imath_ranged_rand(8, 10);
+ const int frame = imath_ranged_rand(8, 10);
series_play("136cw01", 0xf00, 0, 3, 6, 0, 100, 0, 0, frame, frame);
} else {
- ws_walk(217, 268, 0, 4, 2);
+ ws_walk(217, 268, nullptr, 4, 2);
series_play("136cw01", 0xf00, 2, -1, 6, 0, 100, 0, 0, 0, 10);
}
break;
@@ -300,7 +298,7 @@ void Room133_136::pre_parser() {
}
void Room133_136::parser() {
- bool lookFlag = player_said_any("look", "look at");
+ const bool lookFlag = player_said_any("look", "look at");
_G(kernel).trigger_mode = KT_DAEMON;
if (player_said("gear", "sign") && !_G(flags)[kRoadOpened]) {
diff --git a/engines/m4/burger/rooms/section1/room137.cpp b/engines/m4/burger/rooms/section1/room137.cpp
index eb035ca3c02..6ec260a96d0 100644
--- a/engines/m4/burger/rooms/section1/room137.cpp
+++ b/engines/m4/burger/rooms/section1/room137.cpp
@@ -427,7 +427,7 @@ void Room137::daemon() {
break;
case 3:
- ws_walk(276, 292, 0, -1, 4);
+ ws_walk(276, 292, nullptr, -1, 4);
break;
case kSOMEONE_TOOK_KEYS:
@@ -445,7 +445,7 @@ void Room137::daemon() {
if (_G(player_info).y > 308) {
_sherrifShould = 14;
- ws_walk(307, 349, 0, -1, 2);
+ ws_walk(307, 349, nullptr, -1, 2);
}
kernel_trigger_dispatch_now(kCHANGE_SHERRIF_ANIMATION);
@@ -623,7 +623,7 @@ void Room137::daemon() {
case 3:
ws_demand_location(183, 216, 8);
_G(wilbur_should) = 4;
- ws_walk(171, 236, 0, kCHANGE_WILBUR_ANIMATION, 5);
+ ws_walk(171, 236, nullptr, kCHANGE_WILBUR_ANIMATION, 5);
break;
case 4:
diff --git a/engines/m4/burger/rooms/section1/room139_144.cpp b/engines/m4/burger/rooms/section1/room139_144.cpp
index bff462b4c64..246ab3f521e 100644
--- a/engines/m4/burger/rooms/section1/room139_144.cpp
+++ b/engines/m4/burger/rooms/section1/room139_144.cpp
@@ -134,7 +134,7 @@ void Room139_144::init() {
case 142:
ws_demand_location(670, 257, 9);
- ws_walk(596, 245, 0, -1, 8);
+ ws_walk(596, 245, nullptr, -1, 8);
break;
default:
diff --git a/engines/m4/burger/rooms/section1/room142.cpp b/engines/m4/burger/rooms/section1/room142.cpp
index 0bbce0a5689..603bd3fb574 100644
--- a/engines/m4/burger/rooms/section1/room142.cpp
+++ b/engines/m4/burger/rooms/section1/room142.cpp
@@ -182,27 +182,27 @@ void Room142::init() {
case 101:
ws_demand_location(120, 400, 2);
- ws_walk(120, 344, 0, -1, -1);
+ ws_walk(120, 344, nullptr, -1, -1);
break;
case 139:
ws_demand_location(-40, 375, 2);
- ws_walk(25, 344, 0, -1, -1);
+ ws_walk(25, 344, nullptr, -1, -1);
break;
case 143:
ws_demand_location(350, 270, 8);
- ws_walk(297, 275, 0, -1, -1);
+ ws_walk(297, 275, nullptr, -1, -1);
break;
case 145:
ws_demand_location(293, 275, 7);
- ws_walk(282, 280, 0, -1, -1);
+ ws_walk(282, 280, nullptr, -1, -1);
break;
case 170:
ws_demand_location(680, 325, 9);
- ws_walk(613, 331, 0, -1, -1);
+ ws_walk(613, 331, nullptr, -1, -1);
break;
default:
diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index 2fdc8c60089..b2c6bf61278 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -152,7 +152,7 @@ void Room143::init() {
case 142:
player_set_commands_allowed(false);
ws_demand_location(148, 247, 3);
- ws_walk(249, 252, 0, 13, 4);
+ ws_walk(249, 252, nullptr, 13, 4);
break;
default:
@@ -1095,7 +1095,7 @@ void Room143::daemon() {
player_update_info();
if (_G(player_info).y < 304) {
- ws_walk(220, 304, 0, -1, 2);
+ ws_walk(220, 304, nullptr, -1, 2);
_G(flags)[kDisableFootsteps] = 1;
}
@@ -1139,7 +1139,7 @@ void Room143::daemon() {
Section1::walk();
if (_G(player_info).y < 300)
- ws_walk(213, 287, 0, -1, 2);
+ ws_walk(213, 287, nullptr, -1, 2);
showEmptyPlates();
_burlShould = 45;
diff --git a/engines/m4/burger/rooms/section1/room145.cpp b/engines/m4/burger/rooms/section1/room145.cpp
index 7c15fa91e21..ee2dbc4d641 100644
--- a/engines/m4/burger/rooms/section1/room145.cpp
+++ b/engines/m4/burger/rooms/section1/room145.cpp
@@ -227,7 +227,7 @@ void Room145::init() {
case 142:
ws_demand_location(680, 340, 9);
- ws_walk(570, 330, 0, -1, -1);
+ ws_walk(570, 330, nullptr, -1, -1);
break;
default:
diff --git a/engines/m4/burger/rooms/section1/room170.cpp b/engines/m4/burger/rooms/section1/room170.cpp
index e2c53e130e6..8d16441eb02 100644
--- a/engines/m4/burger/rooms/section1/room170.cpp
+++ b/engines/m4/burger/rooms/section1/room170.cpp
@@ -81,7 +81,7 @@ void Room170::init() {
case 142:
ws_demand_location(-40, 375, 2);
- ws_walk(25, 350, 0, 1);
+ ws_walk(25, 350, nullptr, 1);
break;
case 171:
diff --git a/engines/m4/burger/rooms/section1/room171.cpp b/engines/m4/burger/rooms/section1/room171.cpp
index 5a106cedfab..eb5aabf9978 100644
--- a/engines/m4/burger/rooms/section1/room171.cpp
+++ b/engines/m4/burger/rooms/section1/room171.cpp
@@ -471,7 +471,7 @@ void Room171::daemon() {
player_update_info();
if (_flag1 && (_G(player_info).x != 436 || _G(player_info).y != 288))
- ws_walk(436, 288, 0, kRESUME_CONVERSATION, 2);
+ ws_walk(436, 288, nullptr, kRESUME_CONVERSATION, 2);
digi_play_loop("171_009", 2, 50);
_series[0] = series_play("171ap11", 0x8ff, 32, 4, 6, -1);
diff --git a/engines/m4/burger/rooms/section3/room303.cpp b/engines/m4/burger/rooms/section3/room303.cpp
index 645032c39ff..9fe87567200 100644
--- a/engines/m4/burger/rooms/section3/room303.cpp
+++ b/engines/m4/burger/rooms/section3/room303.cpp
@@ -226,22 +226,22 @@ void Room303::doDaemon(int trigger) {
case 2:
if (_G(flags)[V115] > 1) {
player_set_commands_allowed(true);
- ws_walk(290, 325, 0, 4, 1);
+ ws_walk(290, 325, nullptr, 4, 1);
} else {
_G(wilbur_should) = 18;
player_set_commands_allowed(false);
- ws_walk(290, 325, 0, kCHANGE_WILBUR_ANIMATION, 1);
+ ws_walk(290, 325, nullptr, kCHANGE_WILBUR_ANIMATION, 1);
}
break;
case 3:
if (_G(flags)[V115] > 1) {
player_set_commands_allowed(true);
- ws_walk(261, 276, 0, 4, 3);
+ ws_walk(261, 276, nullptr, 4, 3);
} else {
_G(wilbur_should) = 18;
player_set_commands_allowed(false);
- ws_walk(261, 276, 0, kCHANGE_WILBUR_ANIMATION, 3);
+ ws_walk(261, 276, nullptr, kCHANGE_WILBUR_ANIMATION, 3);
}
break;
diff --git a/engines/m4/burger/rooms/section4/room402.cpp b/engines/m4/burger/rooms/section4/room402.cpp
index 7a26a55799f..80767d6f603 100644
--- a/engines/m4/burger/rooms/section4/room402.cpp
+++ b/engines/m4/burger/rooms/section4/room402.cpp
@@ -738,7 +738,7 @@ void Room402::daemon() {
if (++_val4 == 2) {
_val4 = 0;
_stolieShould = 6;
- ws_walk(316, 354, 0, -1, 2);
+ ws_walk(316, 354, nullptr, -1, 2);
}
break;
diff --git a/engines/m4/burger/rooms/section5/room502.cpp b/engines/m4/burger/rooms/section5/room502.cpp
index ee1096d4435..920de098c2b 100644
--- a/engines/m4/burger/rooms/section5/room502.cpp
+++ b/engines/m4/burger/rooms/section5/room502.cpp
@@ -289,7 +289,7 @@ void Room502::init() {
case 503:
ws_demand_location(620, 311, 9);
- ws_walk(304, 308, 0, -1, -1);
+ ws_walk(304, 308, nullptr, -1, -1);
player_set_commands_allowed(true);
kernel_trigger_dispatch_now(24);
break;
diff --git a/engines/m4/burger/rooms/section5/room503.cpp b/engines/m4/burger/rooms/section5/room503.cpp
index b2638344807..92e111663d2 100644
--- a/engines/m4/burger/rooms/section5/room503.cpp
+++ b/engines/m4/burger/rooms/section5/room503.cpp
@@ -688,7 +688,7 @@ void Room503::daemon() {
if (_G(player).walker_visible && player_commands_allowed()) {
intr_cancel_sentence();
player_set_commands_allowed(false);
- ws_walk(260, 300, 0, 17, 2, true);
+ ws_walk(260, 300, nullptr, 17, 2, true);
} else {
kernel_timing_trigger(15, 16);
}
@@ -824,7 +824,7 @@ void Room503::daemon() {
case 6:
ws_unhide_walker();
- ws_walk(260, 300, 0, -1, 2);
+ ws_walk(260, 300, nullptr, -1, 2);
kernel_timing_trigger(imath_ranged_rand(180, 360), 19);
break;
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index 3c853b0f4c8..052964da5f0 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -999,7 +999,7 @@ void Room602::daemon() {
player_set_commands_allowed(false);
player_update_info();
_G(wilbur_should) = 21;
- ws_walk(_G(player_info).x + 1, 304, 0, kCHANGE_WILBUR_ANIMATION, 3);
+ ws_walk(_G(player_info).x + 1, 304, nullptr, kCHANGE_WILBUR_ANIMATION, 3);
break;
case 21:
diff --git a/engines/m4/burger/rooms/section6/room604.cpp b/engines/m4/burger/rooms/section6/room604.cpp
index 0baca831669..844af120a32 100644
--- a/engines/m4/burger/rooms/section6/room604.cpp
+++ b/engines/m4/burger/rooms/section6/room604.cpp
@@ -562,7 +562,7 @@ void Room604::daemon() {
player_update_info();
_G(wilbur_should) = 15;
- ws_walk(_G(player_info).x + 1, 316, 0, kCHANGE_WILBUR_ANIMATION, 3);
+ ws_walk(_G(player_info).x + 1, 316, nullptr, kCHANGE_WILBUR_ANIMATION, 3);
break;
case 15:
diff --git a/engines/m4/burger/rooms/section7/room702.cpp b/engines/m4/burger/rooms/section7/room702.cpp
index 2d177f16b91..a79c725d0a2 100644
--- a/engines/m4/burger/rooms/section7/room702.cpp
+++ b/engines/m4/burger/rooms/section7/room702.cpp
@@ -220,7 +220,7 @@ void Room702::daemon() {
case kCHANGE_WILBUR_ANIMATION:
switch (_G(wilbur_should)) {
case 10:
- ws_walk(236, 338, 0, 11, 4);
+ ws_walk(236, 338, nullptr, 11, 4);
break;
case 11:
@@ -256,7 +256,7 @@ void Room702::parser() {
wilbur_speech("702W003");
}
} else if (player_said("DOOR", "GEAR")) {
- ws_walk(174, 316, 0, -1, 10);
+ ws_walk(174, 316, nullptr, -1, 10);
wilbur_speech("702W005");
} else if (!_G(walker).wilbur_said(SAID)) {
More information about the Scummvm-git-logs
mailing list