[Scummvm-git-logs] scummvm master -> 9738620175763e56ca36aecd05a4464253a3e20f
dreammaster
noreply at scummvm.org
Sun Feb 9 05:13:41 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:
74db0a2f80 M4: RIDDLE: Fix opening cellar door
fe193edae9 M4: RIDDLE: Fix moving rice sack in cellar
9738620175 M4: RIDDLE: Further root cellar fixes
Commit: 74db0a2f80745dcf34deee68611ee0dc17903534
https://github.com/scummvm/scummvm/commit/74db0a2f80745dcf34deee68611ee0dc17903534
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-08T20:23:05-08:00
Commit Message:
M4: RIDDLE: Fix opening cellar door
Changed paths:
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room801.h
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 384affb1224..a409926fa5b 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -88,7 +88,7 @@ void Room801::init() {
_G(flags)[V251] = 0;
_G(flags)[kTerracottaSoldiers] = 0;
_G(flags)[V273] = 0;
- _cellarDoorOpened = 0;
+ _cellarOpenFl = false;
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
@@ -111,15 +111,15 @@ void Room801::init() {
20, 310, 3, triggerMachineByHashCallback3000, "mc_trek");
kernel_timing_trigger(60, 1, nullptr);
} else if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
- if (_cellarDoorOpened) {
+ if (_cellarOpenFl) {
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
_cellarDoorOpenSeries = series_load("CELLAR DOOR OPEN", -1, nullptr);
_cellarDoorOpenMach = series_place_sprite("CELLAR DOOR OPEN", 0, 0, -53, 100, 1024);
} else {
- hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
- hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
+ hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
+ hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", false);
_cellarDoorClosedSeries = series_load("CELLAR DOOR CLOSED", -1, nullptr);
_cellarDoorClosedMach = series_place_sprite("CELLAR DOOR CLOSED", 0, 0, -53, 100, 1280);
@@ -132,7 +132,7 @@ void Room801::init() {
ws_demand_facing(_G(my_walker), 8);
ws_demand_location(_G(my_walker), 525, 301);
_ripReturnsFromRootCellarSeries = series_load("rip returns from root cellar", -1, nullptr);
- _cellarDoorOpened = 1;
+ _cellarOpenFl = true;
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
@@ -161,9 +161,9 @@ void Room801::pre_parser() {
void Room801::parser() {
const bool lookFl = player_said_any("look", "look at");
- const bool takeFl = player_said_any("talk", "talk to");
+ const bool talkFl = player_said_any("talk", "talk to");
const bool gearFl = player_said("gear");
- const bool talkFl = player_said("take");
+ const bool takeFl = player_said("take");
const bool goFl = player_said("go");
if (player_said("conv801a"))
@@ -1185,7 +1185,7 @@ void Room801::daemon() {
}
void Room801::syncGame(Common::Serializer &s) {
- s.syncAsSint32LE(_cellarDoorOpened);
+ s.syncAsByte(_cellarOpenFl);
}
void Room801::room801_conv801a() {
diff --git a/engines/m4/riddle/rooms/section8/room801.h b/engines/m4/riddle/rooms/section8/room801.h
index 9e5b73a82a6..f6026fa66b0 100644
--- a/engines/m4/riddle/rooms/section8/room801.h
+++ b/engines/m4/riddle/rooms/section8/room801.h
@@ -70,7 +70,6 @@ private:
int32 _rptmr15Series = 0;
int32 _shovelSeries = 0;
- int32 _cellarDoorOpened = 0;
int32 _counter = 0;
int32 _ripleyShould = 0;
int32 _meiShould = 0;
Commit: fe193edae9c86a65e11f2f756bc2d54cfc7c5d09
https://github.com/scummvm/scummvm/commit/fe193edae9c86a65e11f2f756bc2d54cfc7c5d09
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-08T20:51:27-08:00
Commit Message:
M4: RIDDLE: Fix moving rice sack in cellar
Changed paths:
engines/m4/riddle/flags.h
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room802.cpp
diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index 71c91030903..c9bf0284ff9 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -287,7 +287,7 @@ enum Flag {
V250 = 250,
V251 = 251,
kTerracottaSoldiers = 252,
- V253 = 253,
+ kRiceSackMoved = 253,
V254 = 254,
V255 = 255,
V256 = 256,
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index a409926fa5b..e3ca96ac9f8 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -235,7 +235,7 @@ void Room801::parser() {
sendWSMessage_110000(_G(my_walker), 1);
break;
case 1:
- if (_G(flags)[V253]) {
+ if (_G(flags)[kRiceSackMoved]) {
digi_play("801R15A", 1, 255, 2, -1);
} else {
digi_play("801R15", 1, 255, 2, -1);
@@ -540,7 +540,7 @@ void Room801::parser() {
}
else if (talkFl && player_said("farmer")) {
- if (_G(flags)[kTerracottaSoldiers] || _G(flags)[V253] || _G(flags)[V255]) {
+ if (_G(flags)[kTerracottaSoldiers] || _G(flags)[kRiceSackMoved] || _G(flags)[V255]) {
ws_hide_walker(_G(my_walker));
player_set_commands_allowed(false);
_ripAnimationMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 167, 303, 49, 1280, true, triggerMachineByHashCallback, "rip talking to farmer");
@@ -563,7 +563,7 @@ void Room801::parser() {
conv_set_shading(65);
conv_export_value(conv_get_handle(), _G(flags)[kTerracottaSoldiers], 0);
conv_export_value(conv_get_handle(), _G(flags)[V255], 1);
- conv_export_value(conv_get_handle(), _G(flags)[V253], 2);
+ conv_export_value(conv_get_handle(), _G(flags)[kRiceSackMoved], 2);
conv_play(conv_get_handle());
} else {
diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index 9b146a85244..b1cb36ca457 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -46,7 +46,7 @@ void Room802::init() {
digi_preload("801_s02", -1);
digi_play_loop("801_s02", 3, 35, -1, -1);
if (!player_been_here(802)) {
- _G(flags)[V253] = 0;
+ _G(flags)[kRiceSackMoved] = 0;
_G(flags)[V254] = 0;
_G(flags)[V255] = 0;
}
@@ -78,7 +78,7 @@ void Room802::init() {
_holeInWall = series_load("HOLE IN WALL", -1, nullptr);
}
- if (_G(flags)[V253]) {
+ if (!_G(flags)[kRiceSackMoved]) {
_sackAgainstWall = series_load("SACK AGAINST WALL", -1, nullptr);
_ripDragsSack = series_load("RIP DRAGS SACK ASIDE", -1, nullptr);
}
@@ -97,7 +97,7 @@ void Room802::init() {
hotspot_set_active(_G(currentSceneDef).hotspots, "HOLE ", false);
}
- if (_G(flags)[V253]) {
+ if (_G(flags)[kRiceSackMoved]) {
hotspot_set_active(_G(currentSceneDef).hotspots, "RICE SACK", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "RICE SACK ", true);
} else {
@@ -110,7 +110,7 @@ void Room802::init() {
_sackAgainstWallMach = series_place_sprite("802SACK2", 0, 0, 0, 100, 768);
}
- if (_G(flags)[V255] || !_G(flags)[V253])
+ if (_G(flags)[V255] || !_G(flags)[kRiceSackMoved])
hotspot_set_active(_G(currentSceneDef).hotspots, "HAND", false);
else {
hotspot_set_active(_G(currentSceneDef).hotspots, "HAND", true);
@@ -264,7 +264,8 @@ void Room802::parser() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip moves sack of rice");
+ _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, false,
+ triggerMachineByHashCallback, "rip moves sack of rice");
ws_hide_walker(_G(my_walker));
terminateMachine(_sackAgainstWallMach);
sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDragsSack, 1, 15, 10, _ripDragsSack, 15, 15, 0);
@@ -281,7 +282,7 @@ void Room802::parser() {
_handInWallMach = series_place_sprite("HAND IN WALL", 0, 0, 0, 100, 512);
series_unload(_ripDragsSack);
series_unload(_sackAgainstWall);
- _G(flags)[V253] = 1;
+ _G(flags)[kRiceSackMoved] = 1;
hotspot_set_active(_G(currentSceneDef).hotspots, "rice sack", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "rice sack ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "hand", true);
@@ -301,7 +302,7 @@ void Room802::parser() {
}
else if ((player_said("farmer's shovel", "hand") || player_said("farmer's shovel", "wall")) && _G(flags)[V254] == 0) {
- if (_G(flags)[V253]) {
+ if (_G(flags)[kRiceSackMoved]) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -456,12 +457,12 @@ void Room802::daemon() {
break;
case 14:
player_set_commands_allowed(false);
- setGlobals1(1, _ripArmXPos3, 15, 15, 15, 0, 15, 1, 1, 1, 0, 1, 1, 1, 1, 0, 15, 15, 15, 15, 0);
+ setGlobals1(_ripArmXPos3, 1, 15, 15, 15, 0, 15, 1, 1, 1, 0, 1, 1, 1, 1, 0, 15, 15, 15, 15, 0);
sendWSMessage_110000(_G(my_walker), 16);
break;
case 16:
sendWSMessage_150000(_G(my_walker), 0);
- setGlobals1(1, _ripTalkOffTd33, 3, 3, 3, 0, 3, 1, 1, 1, 0, 1, 1, 1, 1, 0, 3, 3, 3, 3, 0);
+ setGlobals1(_ripTalkOffTd33, 1, 3, 3, 3, 0, 3, 1, 1, 1, 0, 1, 1, 1, 1, 0, 3, 3, 3, 3, 0);
sendWSMessage_110000(_G(my_walker), 15);
if (player_said("rice sack") || player_said("rice sack "))
digi_play("802R01", 1, 255, 17, -1);
Commit: 9738620175763e56ca36aecd05a4464253a3e20f
https://github.com/scummvm/scummvm/commit/9738620175763e56ca36aecd05a4464253a3e20f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-08T21:13:34-08:00
Commit Message:
M4: RIDDLE: Further root cellar fixes
Changed paths:
engines/m4/riddle/rooms/section8/room802.cpp
engines/m4/riddle/rooms/section8/room802.h
diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index b1cb36ca457..517fe074eae 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -59,14 +59,14 @@ void Room802::init() {
_ripArmXPos3 = series_load("RIP TREK ARMS X POS3", -1, nullptr);
_ripTalkOffTd33 = series_load("RIP HEAD DOWN TALK OFF TD33", -1, nullptr);
- if (_G(flags)[V254]) {
+ if (!_G(flags)[V254]) {
_handInWall = series_load("HAND IN WALL", -1, nullptr);
if (inv_player_has("farmer's shovel")) {
_ripDigsWall = series_load("802 RIP DIGS AT WALL", -1, nullptr);
}
}
- if (_G(flags)[V255]) {
+ if (!_G(flags)[V255]) {
_handInWallPartlyDug = series_load("HAND IN WALL PARTLY DUG ", -1, nullptr);
if (inv_player_has("farmer's shovel")) {
_ripTugsOnArm = series_load("RIP TUGS ON ARM", -1, nullptr);
@@ -110,9 +110,9 @@ void Room802::init() {
_sackAgainstWallMach = series_place_sprite("802SACK2", 0, 0, 0, 100, 768);
}
- if (_G(flags)[V255] || !_G(flags)[kRiceSackMoved])
+ if (_G(flags)[V255] || !_G(flags)[kRiceSackMoved]) {
hotspot_set_active(_G(currentSceneDef).hotspots, "HAND", false);
- else {
+ } else {
hotspot_set_active(_G(currentSceneDef).hotspots, "HAND", true);
if (_G(flags)[V254])
_handInWallMach = series_place_sprite("HAND IN WALL PARTLY DUG ", 0, 0, 0, 100, 512);
@@ -195,8 +195,8 @@ void Room802::parser() {
player_set_commands_allowed(false);
interface_hide();
ws_unhide_walker(_G(my_walker));
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip lights match");
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _lookWithMatch, 1, 12, 10, _lookWithMatch, 12, 12, 0);
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip lights match");
+ sendWSMessage_10000(1, _ripActionMach, _lookWithMatch, 1, 12, 10, _lookWithMatch, 12, 12, 0);
break;
case 1:
digi_play("802r16", 1, 255, 2, 802);
@@ -209,7 +209,7 @@ void Room802::parser() {
break;
case 4:
inv_move_object("match", 999);
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
player_set_commands_allowed(true);
_G(flags)[V260] = 1;
adv_kill_digi_between_rooms(false);
@@ -217,7 +217,7 @@ void Room802::parser() {
_G(game).new_room = 801;
break;
case 10:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _lookWithMatch, 13, 18, 1, _lookWithMatch, 19, 22, 1);
+ sendWSMessage_10000(1, _ripActionMach, _lookWithMatch, 13, 18, 1, _lookWithMatch, 19, 22, 1);
digi_play("802_s05", 2, 255, -1, -1);
break;
default:
@@ -230,8 +230,8 @@ void Room802::parser() {
case -1:
player_set_commands_allowed(false);
ws_hide_walker(_G(my_walker));
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip bends down to look in hole / at hand");
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripLooksAtHand, 1, 17, 1, _ripLooksAtHand, 17, 17, 0);
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip bends down to look in hole / at hand");
+ sendWSMessage_10000(1, _ripActionMach, _ripLooksAtHand, 1, 17, 1, _ripLooksAtHand, 17, 17, 0);
break;
case 1:
if (player_said("hole")) {
@@ -245,11 +245,12 @@ void Room802::parser() {
}
break;
case 2:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripLooksAtHand, 17, 1, 3, _ripLooksAtHand, 1, 1, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripLooksAtHand, 17, 1, 3, _ripLooksAtHand, 1, 1, 0);
break;
case 3:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
ws_unhide_walker(_G(my_walker));
+ player_set_commands_allowed(true);
break;
default:
break;
@@ -264,20 +265,20 @@ void Room802::parser() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, false,
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, false,
triggerMachineByHashCallback, "rip moves sack of rice");
ws_hide_walker(_G(my_walker));
terminateMachine(_sackAgainstWallMach);
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDragsSack, 1, 15, 10, _ripDragsSack, 15, 15, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripDragsSack, 1, 15, 10, _ripDragsSack, 15, 15, 0);
break;
case 1:
digi_play("802r05", 1, 255, 2, -1);
break;
case 2:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDragsSack, 41, 46, 3, _ripDragsSack, 46, 46, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripDragsSack, 41, 46, 3, _ripDragsSack, 46, 46, 0);
break;
case 3:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
ws_unhide_walker(_G(my_walker));
_handInWallMach = series_place_sprite("HAND IN WALL", 0, 0, 0, 100, 512);
series_unload(_ripDragsSack);
@@ -289,11 +290,11 @@ void Room802::parser() {
player_set_commands_allowed(true);
break;
case 10:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDragsSack, 16, 25, 11, _ripDragsSack, 25, 25, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripDragsSack, 16, 25, 11, _ripDragsSack, 25, 25, 0);
digi_play("802_s01", 2, 255, -1, -1);
break;
case 11:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDragsSack, 26, 40, 1, _ripDragsSack, 40, 40, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripDragsSack, 26, 40, 1, _ripDragsSack, 40, 40, 0);
digi_stop(2);
break;
default:
@@ -308,22 +309,22 @@ void Room802::parser() {
player_set_commands_allowed(false);
ws_hide_walker(_G(my_walker));
terminateMachine(_handInWallMach);
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "802 rip digs at wall");
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDigsWall, 1, 24, 10, _ripDigsWall, 24, 24, 0);
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "802 rip digs at wall");
+ sendWSMessage_10000(1, _ripActionMach, _ripDigsWall, 1, 24, 10, _ripDigsWall, 24, 24, 0);
break;
case 1:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
ws_unhide_walker((_G(my_walker)));
_handInWallMach = series_place_sprite("HAND IN WALL PARTLY DUG ", 0, 0, 0, 100, 512);
_G(flags)[V254] = 1;
player_set_commands_allowed(true);
break;
case 10:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDigsWall, 25, 54, 11, _ripDigsWall, 54, 54, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripDigsWall, 25, 54, 11, _ripDigsWall, 54, 54, 0);
digi_play("802_s04", 2, 255, -1, -1);
break;
case 11:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDigsWall, 55, 66, 1, _ripDigsWall, 66, 66, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripDigsWall, 55, 66, 1, _ripDigsWall, 66, 66, 0);
digi_stop(2);
break;
default:
@@ -341,16 +342,16 @@ void Room802::parser() {
case -1:
player_set_commands_allowed(false);
ws_unhide_walker(_G(my_walker));
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip tugs at hand and removes it");
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip tugs at hand and removes it");
terminateMachine(_handInWallMach);
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsOnArm, 1, 36, 10, _ripTugsOnArm, 36, 36, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsOnArm, 1, 36, 10, _ripTugsOnArm, 36, 36, 0);
break;
case 10:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsOnArm, 37, 68, 20, _ripTugsOnArm, 68, 68, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsOnArm, 37, 68, 20, _ripTugsOnArm, 68, 68, 0);
digi_play("802_s03", 2, 255, -1, -1);
break;
case 20:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
ws_unhide_walker(_G(my_walker));
_holeInWallMach = series_place_sprite("HOLE IN WALL", 0, 0, 0, 100, 512);
_sackAgainstWallMach = series_place_sprite("802SACK2", 0, 0, 0, 100, 768);
@@ -379,15 +380,20 @@ void Room802::parser() {
case -1:
player_set_commands_allowed(false);
ws_hide_walker(_G(my_walker));
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512, false, triggerMachineByHashCallback, "rip tugs at hand (noshovel)");
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 512,
+ false, triggerMachineByHashCallback, "rip tugs at hand (noshovel)");
terminateMachine(_handInWallMach);
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsBeforeDigging, 1, 15, 10, _ripTugsBeforeDigging, 15, 15, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsBeforeDigging, 1, 15, 10,
+ _ripTugsBeforeDigging, 15, 15, 0);
break;
case 1:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsBeforeDigging, 26, 20, 2, _ripTugsBeforeDigging, 19, 19, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsBeforeDigging, 26, 20, 2,
+ _ripTugsBeforeDigging, 19, 19, 0);
break;
case 2:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsBeforeDigging, 19, 15, 13, _ripTugsBeforeDigging, 15, 15, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsBeforeDigging, 19, 15, 13,
+ _ripTugsBeforeDigging, 15, 15, 0);
+
if (inv_player_has("farmer's shovel")) {
if (_G(flags)[V254] == 1)
digi_play("802r07", 1, 255, -1, -1);
@@ -396,17 +402,19 @@ void Room802::parser() {
}
break;
case 3:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
ws_unhide_walker(_G(my_walker));
_handInWallMach = series_place_sprite("HAND IN WALL", 0, 0, 0, 100, 512);
player_set_commands_allowed(true);
break;
case 10:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsBeforeDigging, 16, 26, 1, _ripTugsBeforeDigging, 26, 26, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsBeforeDigging, 16, 26, 1,
+ _ripTugsBeforeDigging, 26, 26, 0);
digi_play("802_s02", 2, 255, -1, -1);
break;
case 13:
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripTugsBeforeDigging, 14, 1, 3, _ripTugsBeforeDigging, 1, 1, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripTugsBeforeDigging, 14, 1, 3,
+ _ripTugsBeforeDigging, 1, 1, 0);
digi_stop(2);
break;
default:
@@ -423,15 +431,15 @@ void Room802::parser() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "rip walks up stairs");
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "rip walks up stairs");
ws_hide_walker(_G(my_walker));
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripUpStairs, 1, 23, 1, _ripUpStairs, 24, 29, 0);
+ sendWSMessage_10000(1, _ripActionMach, _ripUpStairs, 1, 23, 1, _ripUpStairs, 24, 29, 0);
break;
case 1:
disable_player_commands_and_fade_init(2);
break;
case 2:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
_G(game).new_room = 801;
break;
default:
@@ -452,8 +460,8 @@ void Room802::daemon() {
case 6:
case 7:
player_set_commands_allowed(false);
- _ripWalksDownstairsMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "rip walks down stairs");
- sendWSMessage_10000(1, _ripWalksDownstairsMach, _ripDownStairs, 1, 20, 51, _ripDownStairs, 20, 20, 0);
+ _ripActionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "rip walks down stairs");
+ sendWSMessage_10000(1, _ripActionMach, _ripDownStairs, 1, 20, 51, _ripDownStairs, 20, 20, 0);
break;
case 14:
player_set_commands_allowed(false);
@@ -481,7 +489,7 @@ void Room802::daemon() {
player_set_commands_allowed(true);
break;
case 51:
- terminateMachine(_ripWalksDownstairsMach);
+ terminateMachine(_ripActionMach);
ws_unhide_walker(_G(my_walker));
series_unload(_ripDownStairs);
player_set_commands_allowed(true);
diff --git a/engines/m4/riddle/rooms/section8/room802.h b/engines/m4/riddle/rooms/section8/room802.h
index 3fb337c86ad..d1d0211dc8b 100644
--- a/engines/m4/riddle/rooms/section8/room802.h
+++ b/engines/m4/riddle/rooms/section8/room802.h
@@ -59,7 +59,7 @@ private:
machine *_handInWallMach = nullptr;
machine *_holeInWallMach = nullptr;
- machine *_ripWalksDownstairsMach = nullptr;
+ machine *_ripActionMach = nullptr;
machine *_sackAgainstWallMach = nullptr;
};
More information about the Scummvm-git-logs
mailing list