[Scummvm-git-logs] scummvm master -> 7363dd37edd6b789493ebb6d4818157888a94b94
dreammaster
noreply at scummvm.org
Sun Feb 9 16:49:59 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:
88fe7c85f6 M4: RIDDLE: Fix digging in cellar wall
8221e8b945 M4: RIDDLE: Cellar hole fixes
7363dd37ed M4: RIDDLE: Further ixes for digging hole in root cellar
Commit: 88fe7c85f6bad7612e42527a03e66d52ee9c084d
https://github.com/scummvm/scummvm/commit/88fe7c85f6bad7612e42527a03e66d52ee9c084d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T08:49:50-08:00
Commit Message:
M4: RIDDLE: Fix digging in cellar wall
Changed paths:
engines/m4/platform/sound/digi.cpp
engines/m4/riddle/flags.h
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room802.cpp
diff --git a/engines/m4/platform/sound/digi.cpp b/engines/m4/platform/sound/digi.cpp
index 673ac994286..38be5b66f31 100644
--- a/engines/m4/platform/sound/digi.cpp
+++ b/engines/m4/platform/sound/digi.cpp
@@ -241,7 +241,6 @@ void digi_unload(const Common::String &name) {
}
int32 digi_play(const char *name, uint channel, int32 vol, int32 trigger, int32 room_num) {
- warning("digi_play: %s", name);
return _G(digi).play(name, channel, vol, trigger, room_num);
}
diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index c9bf0284ff9..7bec244bfff 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -288,8 +288,8 @@ enum Flag {
V251 = 251,
kTerracottaSoldiers = 252,
kRiceSackMoved = 253,
- V254 = 254,
- V255 = 255,
+ kDugInWall = 254,
+ kOpenedHoleInWall = 255,
V256 = 256,
V257 = 257,
V258 = 258,
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index e3ca96ac9f8..8fd5cf904f7 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -540,7 +540,7 @@ void Room801::parser() {
}
else if (talkFl && player_said("farmer")) {
- if (_G(flags)[kTerracottaSoldiers] || _G(flags)[kRiceSackMoved] || _G(flags)[V255]) {
+ if (_G(flags)[kTerracottaSoldiers] || _G(flags)[kRiceSackMoved] || _G(flags)[kOpenedHoleInWall]) {
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");
@@ -562,7 +562,7 @@ void Room801::parser() {
conv_load("conv801a", 10, 10, 747);
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)[kOpenedHoleInWall], 1);
conv_export_value(conv_get_handle(), _G(flags)[kRiceSackMoved], 2);
conv_play(conv_get_handle());
diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index 517fe074eae..f8e735bafb4 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -47,8 +47,8 @@ void Room802::init() {
digi_play_loop("801_s02", 3, 35, -1, -1);
if (!player_been_here(802)) {
_G(flags)[kRiceSackMoved] = 0;
- _G(flags)[V254] = 0;
- _G(flags)[V255] = 0;
+ _G(flags)[kDugInWall] = 0;
+ _G(flags)[kOpenedHoleInWall] = 0;
}
digi_preload("802_s01", -1);
@@ -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)[kDugInWall]) {
_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)[kOpenedHoleInWall]) {
_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);
@@ -88,7 +88,7 @@ void Room802::init() {
_ripDownStairs = series_load("802 RIP DOWN STAIRS", -1, nullptr);
_ripLooksAtHand = series_load("RIP looks at hand in wall", -1, nullptr);
- if (inv_player_has("match") && !_G(flags)[V255]) {
+ if (inv_player_has("match") && !_G(flags)[kOpenedHoleInWall]) {
_lookWithMatch = series_load("802 LOOK WITH MATCH", -1, nullptr);
hotspot_set_active(_G(currentSceneDef).hotspots, "HOLE", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "HOLE ", true);
@@ -106,26 +106,26 @@ void Room802::init() {
hotspot_set_active(_G(currentSceneDef).hotspots, "RICE SACK ", false);
}
- if (_G(flags)[V255]) {
+ if (_G(flags)[kOpenedHoleInWall]) {
_sackAgainstWallMach = series_place_sprite("802SACK2", 0, 0, 0, 100, 768);
}
- if (_G(flags)[V255] || !_G(flags)[kRiceSackMoved]) {
+ if (_G(flags)[kOpenedHoleInWall] || !_G(flags)[kRiceSackMoved]) {
hotspot_set_active(_G(currentSceneDef).hotspots, "HAND", false);
} else {
hotspot_set_active(_G(currentSceneDef).hotspots, "HAND", true);
- if (_G(flags)[V254])
+ if (_G(flags)[kDugInWall])
_handInWallMach = series_place_sprite("HAND IN WALL PARTLY DUG ", 0, 0, 0, 100, 512);
else
_handInWallMach = series_place_sprite("HAND IN WALL", 0, 0, 0, 100, 512);
}
- if (_G(flags)[V255])
+ if (_G(flags)[kOpenedHoleInWall])
_holeInWallMach = series_place_sprite("HOLE IN WALL", 0, 0, 0, 100, 512);
else
hotspot_set_active(_G(currentSceneDef).hotspots, "HOLE", false);
- if (_G(flags)[V255])
+ if (_G(flags)[kOpenedHoleInWall])
hotspot_set_active(_G(currentSceneDef).hotspots, "WALL", false);
if (_G(game).previous_room == KERNEL_RESTORING_GAME)
@@ -179,7 +179,7 @@ void Room802::parser() {
_G(kernel).trigger_mode = KT_PARSE;
}
- else if (lookFl && player_said("wall") && _G(flags)[V255] == 0) {
+ else if (lookFl && player_said("wall") && _G(flags)[kOpenedHoleInWall] == 0) {
if (_G(flags)[kTerracottaSoldiers]) {
_G(kernel).trigger_mode = KT_DAEMON;
kernel_trigger_dispatchx(kernel_trigger_create(14));
@@ -236,7 +236,7 @@ void Room802::parser() {
case 1:
if (player_said("hole")) {
digi_play("802r09", 1, 255, 2, -1);
- } else if (_G(flags)[V254]){
+ } else if (_G(flags)[kDugInWall]){
digi_play("802r15", 1, 255, 2, -1);
} else if (_G(flags)[kTerracottaSoldiers]) {
digi_play("802r02", 1, 255, 2, -1);
@@ -302,7 +302,7 @@ void Room802::parser() {
}
}
- else if ((player_said("farmer's shovel", "hand") || player_said("farmer's shovel", "wall")) && _G(flags)[V254] == 0) {
+ else if ((player_said("farmer's shovel", "hand") || player_said("farmer's shovel", "wall")) && _G(flags)[kDugInWall] == 0) {
if (_G(flags)[kRiceSackMoved]) {
switch (_G(kernel).trigger) {
case -1:
@@ -316,7 +316,7 @@ void Room802::parser() {
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;
+ _G(flags)[kDugInWall] = 1;
player_set_commands_allowed(true);
break;
case 10:
@@ -336,12 +336,12 @@ void Room802::parser() {
}
else if ((gearFl || takeFl) && player_said("hand")) {
- if (inv_player_has("farmer's shovel") && _G(flags)[V254]) {
- if (_G(flags)[V254] >= 1) {
+ if (inv_player_has("farmer's shovel") && _G(flags)[kDugInWall]) {
+ if (_G(flags)[kDugInWall] >= 1) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
- ws_unhide_walker(_G(my_walker));
+ ws_hide_walker(_G(my_walker));
_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, _ripActionMach, _ripTugsOnArm, 1, 36, 10, _ripTugsOnArm, 36, 36, 0);
@@ -367,7 +367,7 @@ void Room802::parser() {
hotspot_set_active(_G(currentSceneDef).hotspots, "hand", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "wall", false);
- _G(flags)[V255] = 1;
+ _G(flags)[kOpenedHoleInWall] = 1;
player_set_commands_allowed(true);
break;
default:
@@ -395,7 +395,7 @@ void Room802::parser() {
_ripTugsBeforeDigging, 15, 15, 0);
if (inv_player_has("farmer's shovel")) {
- if (_G(flags)[V254] == 1)
+ if (_G(flags)[kDugInWall] == 1)
digi_play("802r07", 1, 255, -1, -1);
} else {
digi_play("802r06", 1, 255, -1, -1);
Commit: 8221e8b945bd6f94d9f96b9904e792cbf7adf576
https://github.com/scummvm/scummvm/commit/8221e8b945bd6f94d9f96b9904e792cbf7adf576
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T08:49:50-08:00
Commit Message:
M4: RIDDLE: Cellar hole fixes
Changed paths:
engines/m4/riddle/rooms/section8/room802.cpp
diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index f8e735bafb4..f9e9cea31af 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -88,7 +88,7 @@ void Room802::init() {
_ripDownStairs = series_load("802 RIP DOWN STAIRS", -1, nullptr);
_ripLooksAtHand = series_load("RIP looks at hand in wall", -1, nullptr);
- if (inv_player_has("match") && !_G(flags)[kOpenedHoleInWall]) {
+ if (inv_player_has("match") && _G(flags)[kOpenedHoleInWall]) {
_lookWithMatch = series_load("802 LOOK WITH MATCH", -1, nullptr);
hotspot_set_active(_G(currentSceneDef).hotspots, "HOLE", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "HOLE ", true);
@@ -194,7 +194,7 @@ void Room802::parser() {
case -1:
player_set_commands_allowed(false);
interface_hide();
- ws_unhide_walker(_G(my_walker));
+ ws_hide_walker(_G(my_walker));
_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;
Commit: 7363dd37edd6b789493ebb6d4818157888a94b94
https://github.com/scummvm/scummvm/commit/7363dd37edd6b789493ebb6d4818157888a94b94
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T08:49:50-08:00
Commit Message:
M4: RIDDLE: Further ixes for digging hole in root cellar
Changed paths:
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room802.cpp
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 8fd5cf904f7..3e2ffe5c0d9 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -438,7 +438,7 @@ void Room801::parser() {
break;
case 12:
player_update_info(_G(my_walker), &_G(player_info));
- ws_walk(_G(my_walker), 8, 6, nullptr, 13, 5, true);
+ ws_walk(_G(my_walker), _G(player_info).x + 8, _G(player_info).y + 6, nullptr, 13, 5);
break;
case 13:
hotspot_set_active(_G(currentSceneDef).hotspots, "farmer's shovel", false);
diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index f9e9cea31af..a8f69fa4dab 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -357,11 +357,11 @@ void Room802::parser() {
_sackAgainstWallMach = series_place_sprite("802SACK2", 0, 0, 0, 100, 768);
if (inv_player_has("match")) {
- hotspot_set_active(_G(currentSceneDef).hotspots, "hole", true);
- hotspot_set_active(_G(currentSceneDef).hotspots, "hole ", false);
- } else {
- hotspot_set_active(_G(currentSceneDef).hotspots, "hole", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "hole ", true);
+ hotspot_set_active(_G(currentSceneDef).hotspots, "hole", false);
+ } else {
+ hotspot_set_active(_G(currentSceneDef).hotspots, "hole ", false);
+ hotspot_set_active(_G(currentSceneDef).hotspots, "hole", true);
}
hotspot_set_active(_G(currentSceneDef).hotspots, "hand", false);
More information about the Scummvm-git-logs
mailing list