[Scummvm-git-logs] scummvm master -> dac8d6b6fdfec12c730d7490d05c034162a1b52c
Strangerke
noreply at scummvm.org
Mon Jan 26 10:08:07 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
dac8d6b6fd M4: BURGER: review and cleanup in rooms 101 to 137
Commit: dac8d6b6fdfec12c730d7490d05c034162a1b52c
https://github.com/scummvm/scummvm/commit/dac8d6b6fdfec12c730d7490d05c034162a1b52c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T11:08:00+01:00
Commit Message:
M4: BURGER: review and cleanup in rooms 101 to 137
Changed paths:
engines/m4/burger/rooms/section1/room101.cpp
engines/m4/burger/rooms/section1/room103.cpp
engines/m4/burger/rooms/section1/room120.cpp
engines/m4/burger/rooms/section1/room134_135.cpp
engines/m4/burger/rooms/section1/room137.cpp
diff --git a/engines/m4/burger/rooms/section1/room101.cpp b/engines/m4/burger/rooms/section1/room101.cpp
index 5d7a353b7fd..f28e9ebdccb 100644
--- a/engines/m4/burger/rooms/section1/room101.cpp
+++ b/engines/m4/burger/rooms/section1/room101.cpp
@@ -47,10 +47,10 @@ static const seriesStreamBreak STREAM_BREAKS2[] = {
};
static const seriesStreamBreak STREAM_BREAKS3[] = {
- { 0, 0, 2, 255, 4, 0, nullptr, 0 },
- { 5, 0, 2, 255, 4, 0, nullptr, 0 },
- { 14, 0, 2, 255, 4, 0, nullptr, 0 },
- { 16, 0, 1, 255, 17, 0, nullptr, 0 },
+ { 0, nullptr, 2, 255, 4, 0, nullptr, 0 },
+ { 5, nullptr, 2, 255, 4, 0, nullptr, 0 },
+ { 14, nullptr, 2, 255, 4, 0, nullptr, 0 },
+ { 16, nullptr, 1, 255, 17, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -230,7 +230,7 @@ void Room101::daemon() {
switch (_G(kernel).trigger) {
case 1:
if (_val2 == 12) {
- int frame = imath_ranged_rand(8, 10);
+ const int frame = imath_ranged_rand(8, 10);
series_play("101ha01", 3840, 0, 1, 6, 0, 100, 0, 0, frame, frame);
} else {
digi_preload("101_002");
@@ -257,7 +257,7 @@ void Room101::daemon() {
case 6:
if (!_G(flags)[kFirstTestPassed]) {
// No tests passed yet
- uint idx = _G(flags)[kNEURO_TEST_COUNTER];
+ const uint idx = _G(flags)[kNEURO_TEST_COUNTER];
assert(idx < 8);
static const char *const NAMES[8] = {
@@ -577,8 +577,7 @@ void Room101::daemon() {
_val2 = 12;
if (_G(flags)[V005]) {
- Common::String name = Common::String::format("101h003%c",
- 'a' + imath_ranged_rand(0, 5));
+ const Common::String name = Common::String::format("101h003%c", 'a' + imath_ranged_rand(0, 5));
digi_play(name.c_str(), 1, 255, kCHANGE_WILBUR_ANIMATION);
} else {
digi_play("101h002", 1, 255, kCHANGE_WILBUR_ANIMATION);
@@ -635,7 +634,7 @@ void Room101::daemon() {
}
void Room101::pre_parser() {
- bool lookAt = player_said_any("look", "look at");
+ const bool lookAt = player_said_any("look", "look at");
if (player_said("vera's diner") && !player_said_any("enter", "gear", "look", "look at"))
player_hotspot_walk_override_just_face(9);
@@ -652,7 +651,7 @@ void Room101::pre_parser() {
}
void Room101::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 (_G(walker).wilbur_said(SAID1)) {
diff --git a/engines/m4/burger/rooms/section1/room103.cpp b/engines/m4/burger/rooms/section1/room103.cpp
index eab7ce29a95..ebd8bd58724 100644
--- a/engines/m4/burger/rooms/section1/room103.cpp
+++ b/engines/m4/burger/rooms/section1/room103.cpp
@@ -410,6 +410,9 @@ void Room103::daemon() {
break;
}
break;
+
+ default:
+ break;
}
break;
diff --git a/engines/m4/burger/rooms/section1/room120.cpp b/engines/m4/burger/rooms/section1/room120.cpp
index 08cf0c3582d..b14c270bd32 100644
--- a/engines/m4/burger/rooms/section1/room120.cpp
+++ b/engines/m4/burger/rooms/section1/room120.cpp
@@ -22,7 +22,6 @@
#include "m4/burger/rooms/section1/room120.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
-#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room134_135.cpp b/engines/m4/burger/rooms/section1/room134_135.cpp
index 9b6d2750651..0279beeeca7 100644
--- a/engines/m4/burger/rooms/section1/room134_135.cpp
+++ b/engines/m4/burger/rooms/section1/room134_135.cpp
@@ -336,7 +336,7 @@ void Room134_135::daemon() {
break;
case 23:
- _play1 = 0;
+ _play1 = nullptr;
break;
case 24:
@@ -800,7 +800,7 @@ void Room134_135::pre_parser() {
}
void Room134_135::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 (_G(walker).wilbur_said((_G(flags)[V000] == 1002) ? SAID1 : SAID2)) {
@@ -857,9 +857,9 @@ void Room134_135::parser() {
void Room134_135::conv01() {
_G(kernel).trigger_mode = KT_PARSE;
- int who = conv_whos_talking();
- int node = conv_current_node();
- int entry = conv_current_entry();
+ const int who = conv_whos_talking();
+ const int node = conv_current_node();
+ const int entry = conv_current_entry();
switch (_G(kernel).trigger) {
case 13:
@@ -940,7 +940,7 @@ void Room134_135::conv01() {
void Room134_135::conv02() {
_G(kernel).trigger_mode = KT_PARSE;
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (_G(kernel).trigger == 35) {
if (who == 0) {
@@ -961,7 +961,7 @@ void Room134_135::conv03() {
_G(kernel).trigger_mode = KT_PARSE;
if (_G(kernel).trigger == 35) {
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (who <= 0) {
if (conv_current_node() == 8 && !conv_current_entry()) {
digi_preload("03p1001");
@@ -975,7 +975,7 @@ void Room134_135::conv03() {
conv_resume();
}
} else if (conv_sound_to_play()) {
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (who <= 0) {
if (conv_current_node() == 8 && conv_current_entry()) {
kernel_timing_trigger(1, 35);
@@ -993,7 +993,7 @@ void Room134_135::conv03() {
_G(kernel).trigger_mode = KT_DAEMON;
digi_play(conv_sound_to_play(), 1, 255, 16);
} else {
- sendWSMessage(0x140000, 0, _G(my_walker), 0, 0, 1);
+ sendWSMessage(0x140000, 0, _G(my_walker), 0, nullptr, 1);
digi_play(conv_sound_to_play(), 1, 255, 35);
}
}
diff --git a/engines/m4/burger/rooms/section1/room137.cpp b/engines/m4/burger/rooms/section1/room137.cpp
index be0e063684b..7a8ee0bac74 100644
--- a/engines/m4/burger/rooms/section1/room137.cpp
+++ b/engines/m4/burger/rooms/section1/room137.cpp
@@ -775,9 +775,9 @@ void Room137::parser() {
void Room137::conv15() {
_G(kernel).trigger_mode = KT_PARSE;
- int who = conv_whos_talking();
- int node = conv_current_node();
- int entry = conv_current_entry();
+ const int who = conv_whos_talking();
+ const int node = conv_current_node();
+ const int entry = conv_current_entry();
if (_G(kernel).trigger == 14) {
if (who <= 0) {
More information about the Scummvm-git-logs
mailing list