[Scummvm-git-logs] scummvm master -> 24cbd0f75c84e36a75734260393bf314f55add4e
Strangerke
noreply at scummvm.org
Mon Jan 26 20:30:22 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
0581b60dec M4: BURGER: Fix unlisted bug in animation of section 5 : Wrong volume set from digi "506_005"
24cbd0f75c M4: BURGER: review and cleanup in section 5
Commit: 0581b60decd3fc7d29eefa5f4f66b8b4b45934e6
https://github.com/scummvm/scummvm/commit/0581b60decd3fc7d29eefa5f4f66b8b4b45934e6
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T21:30:06+01:00
Commit Message:
M4: BURGER: Fix unlisted bug in animation of section 5 : Wrong volume set from digi "506_005"
Changed paths:
engines/m4/burger/rooms/section5/section5_room.cpp
diff --git a/engines/m4/burger/rooms/section5/section5_room.cpp b/engines/m4/burger/rooms/section5/section5_room.cpp
index 9f6ee7115e3..bd732df1825 100644
--- a/engines/m4/burger/rooms/section5/section5_room.cpp
+++ b/engines/m4/burger/rooms/section5/section5_room.cpp
@@ -42,7 +42,7 @@ void Section5Room::init() {
kernel_timing_trigger(120, 5004);
}
- if (Section5::_digiName != 0) {
+ if (Section5::_digiName != nullptr) {
digi_stop(3);
digi_unload(Section5::_digiName);
}
@@ -61,7 +61,12 @@ void Section5Room::init() {
break;
case 506:
- Section5::_digiName = _G(flags)[V218] == 5003 ? "500_002" : "506_005";
+ if (_G(flags)[V218] == 5003) {
+ Section5::_digiName = "500_002";
+ } else {
+ Section5::_digiName = "506_005";
+ vol = 50;
+ }
break;
case 508:
@@ -85,10 +90,10 @@ HotSpotRec *Section5Room::custom_hotspot_which(int32 x, int32 y) {
return hotspot;
assert(_borkTable);
- int index = _borkStairs.regs()[IDX_CELS_INDEX];
- int x1 = _borkTable[index]._x;
- int y1 = _borkTable[index]._y;
- int total = (x - x1) * (x - x1) + (y - y1) * (y - y1);
+ const int index = _borkStairs.regs()[IDX_CELS_INDEX];
+ const int x1 = _borkTable[index]._x;
+ const int y1 = _borkTable[index]._y;
+ const int total = (x - x1) * (x - x1) + (y - y1) * (y - y1);
return (total < _borkThreshold) ? &_borkHotspot : nullptr;
}
Commit: 24cbd0f75c84e36a75734260393bf314f55add4e
https://github.com/scummvm/scummvm/commit/24cbd0f75c84e36a75734260393bf314f55add4e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T21:30:07+01:00
Commit Message:
M4: BURGER: review and cleanup in section 5
Changed paths:
engines/m4/burger/rooms/section5/room502.cpp
engines/m4/burger/rooms/section5/room503.cpp
engines/m4/burger/rooms/section5/room504.cpp
engines/m4/burger/rooms/section5/room505.cpp
engines/m4/burger/rooms/section5/room507.cpp
engines/m4/burger/rooms/section5/room510.cpp
engines/m4/burger/rooms/section5/section5.cpp
diff --git a/engines/m4/burger/rooms/section5/room502.cpp b/engines/m4/burger/rooms/section5/room502.cpp
index 920de098c2b..cd0004efc09 100644
--- a/engines/m4/burger/rooms/section5/room502.cpp
+++ b/engines/m4/burger/rooms/section5/room502.cpp
@@ -165,10 +165,10 @@ const seriesPlayBreak Room502::PLAY7[] = {
};
const seriesPlayBreak Room502::PLAY8[] = {
- { 28, 29, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 30, 35, "502_008b", 1, 100, -1, 0, 0, 0, 0 },
- { 36, 40, "502_008a", 1, 100, -1, 0, 0, 0, 0 },
- { 41, -1, "502_008b", 1, 100, -1, 0, 0, 0, 0 },
+ { 28, 29, 0, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 30, 35, "502_008b", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 36, 40, "502_008a", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 41, -1, "502_008b", 1, 100, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -816,10 +816,10 @@ void Room502::pre_parser() {
void Room502::parser() {
_G(kernel).trigger_mode = KT_DAEMON;
- bool railing = player_said("RAILING") && _G(flags)[kStairsBorkState] == 5003;
- bool takeKindling = player_said("KINDLING ") && player_said("TAKE");
- bool gearKindling = player_said("KINDLING ") && player_said("GEAR");
- bool fireplace = player_said("FIREPLACE") && _G(flags)[kFireplaceHasFire] != 0;
+ const bool railing = player_said("RAILING") && _G(flags)[kStairsBorkState] == 5003;
+ const bool takeKindling = player_said("KINDLING ") && player_said("TAKE");
+ const bool gearKindling = player_said("KINDLING ") && player_said("GEAR");
+ const bool fireplace = player_said("FIREPLACE") && _G(flags)[kFireplaceHasFire] != 0;
if (player_said("LOOK AT", "FRONT DOOR") && _G(flags)[V195]) {
wilbur_speech("502w004");
diff --git a/engines/m4/burger/rooms/section5/room503.cpp b/engines/m4/burger/rooms/section5/room503.cpp
index 92e111663d2..068b385456a 100644
--- a/engines/m4/burger/rooms/section5/room503.cpp
+++ b/engines/m4/burger/rooms/section5/room503.cpp
@@ -259,7 +259,7 @@ const seriesPlayBreak Room503::PLAY23[] = {
};
const seriesPlayBreak Room503::PLAY24[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -735,6 +735,9 @@ void Room503::daemon() {
_val9 = 33;
_series3 = series_play("503bk15", 0xa00, 1, 23, 6, 0, 100, 0, -2, 0, 2);
break;
+
+ default:
+ break;
}
break;
@@ -904,10 +907,10 @@ void Room503::pre_parser() {
void Room503::parser() {
_G(kernel).trigger_mode = KT_DAEMON;
- bool borkFlag = player_said("BORK") && _G(flags)[kBORK_STATE] == 12;
- bool microwaveFlag = player_said("MICROWAVE");
- bool ovenFlag = player_said("OVEN") && _G(flags)[kBORK_STATE] == 16;
- bool prunesFlag = player_said("PRUNES") && _G(flags)[kBORK_STATE] == 16;
+ const bool borkFlag = player_said("BORK") && _G(flags)[kBORK_STATE] == 12;
+ const bool microwaveFlag = player_said("MICROWAVE");
+ const bool ovenFlag = player_said("OVEN") && _G(flags)[kBORK_STATE] == 16;
+ const bool prunesFlag = player_said("PRUNES") && _G(flags)[kBORK_STATE] == 16;
if (borkFlag && player_said("LOOK AT")) {
wilbur_speech("503w005");
diff --git a/engines/m4/burger/rooms/section5/room504.cpp b/engines/m4/burger/rooms/section5/room504.cpp
index 750da8935b4..6e3dcef0b2f 100644
--- a/engines/m4/burger/rooms/section5/room504.cpp
+++ b/engines/m4/burger/rooms/section5/room504.cpp
@@ -574,7 +574,7 @@ void Room504::daemon() {
_val5 = 15;
_G(wilbur_should) = 1;
_state1 = imath_ranged_rand(1, 6);
- int x = (double)(_state1 * _G(player_info).scale * 42) * 0.01 - _G(player_info).x;
+ const int x = (double)(_state1 * _G(player_info).scale * 42) * 0.01 - _G(player_info).x;
ws_demand_location(x, _G(player_info).y);
ws_hide_walker();
diff --git a/engines/m4/burger/rooms/section5/room505.cpp b/engines/m4/burger/rooms/section5/room505.cpp
index 23cde0a3537..d98cb2de909 100644
--- a/engines/m4/burger/rooms/section5/room505.cpp
+++ b/engines/m4/burger/rooms/section5/room505.cpp
@@ -245,6 +245,9 @@ void Room505::daemon() {
case 3:
digi_play((imath_ranged_rand(1, 2) == 1) ? "505b004a" : "505b004b", 2);
break;
+
+ default:
+ break;
}
break;
@@ -302,7 +305,7 @@ void Room505::pre_parser() {
void Room505::parser() {
_G(kernel).trigger_mode = KT_DAEMON;
- bool railingFlag = player_said("RAILING") && _G(flags)[kStairsBorkState] == 5003;
+ const bool railingFlag = player_said("RAILING") && _G(flags)[kStairsBorkState] == 5003;
if (player_said("LOOK AT", "STAIRS") && _G(flags)[kStairsBorkState] == 5003) {
wilbur_speech("505w002");
diff --git a/engines/m4/burger/rooms/section5/room507.cpp b/engines/m4/burger/rooms/section5/room507.cpp
index d9d09a2f3f1..d8f356aa274 100644
--- a/engines/m4/burger/rooms/section5/room507.cpp
+++ b/engines/m4/burger/rooms/section5/room507.cpp
@@ -186,7 +186,7 @@ const seriesPlayBreak Room507::PLAY14[] = {
};
const seriesPlayBreak Room507::PLAY15[] = {
- { 0, -1, "507b013", 2, 255, -1, 0, 0, 0, 0 },
+ { 0, -1, "507b013", 2, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -685,7 +685,7 @@ void Room507::pre_parser() {
void Room507::parser() {
_G(kernel).trigger_mode = KT_DAEMON;
- bool tubFlag = player_said("TUB") && _G(flags)[V223] != 0;
+ const bool tubFlag = player_said("TUB") && _G(flags)[V223] != 0;
if (player_said("LOOK AT", "BORK") && _G(flags)[V223] == 1) {
wilbur_speech("507w003");
diff --git a/engines/m4/burger/rooms/section5/room510.cpp b/engines/m4/burger/rooms/section5/room510.cpp
index fbe2a2e6db5..c67588c08c2 100644
--- a/engines/m4/burger/rooms/section5/room510.cpp
+++ b/engines/m4/burger/rooms/section5/room510.cpp
@@ -262,7 +262,7 @@ void Room510::setButtonState(int index, GUI::ControlStatus state) {
}
void Room510::buttonAction(int index, int firstFrame, int lastFrame) {
- int max = (index == 4) ? 1 : 2;
+ const int max = (index == 4) ? 1 : 2;
digi_play(Common::String::format("510b00%d%c", index, 'a' + imath_ranged_rand(0, max)).c_str(), 2);
series_play("510waves", 0, 0, 2, 6, 2, 100, 0, 0, firstFrame, lastFrame);
}
diff --git a/engines/m4/burger/rooms/section5/section5.cpp b/engines/m4/burger/rooms/section5/section5.cpp
index 677be80f783..6e609cbfb15 100644
--- a/engines/m4/burger/rooms/section5/section5.cpp
+++ b/engines/m4/burger/rooms/section5/section5.cpp
@@ -312,9 +312,9 @@ const char *Section5::PARSER[] = {
};
const seriesPlayBreak Section5::PLAY1[] = {
- { 0, 25, nullptr, 1, 0, -1, 2048, 0, 0, 0 },
- { 26, 42, "500_030", 1, 255, -1, 0, 0, 0, 0 },
- { 43, -1, "500_030", 1, 255, -1, 0, 0, 0, 0 },
+ { 0, 25, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
+ { 26, 42, "500_030", 1, 255, -1, 0, 0, nullptr, 0 },
+ { 43, -1, "500_030", 1, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
More information about the Scummvm-git-logs
mailing list