[Scummvm-git-logs] scummvm master -> 4de686dddf5bb14a69fd07308770107a026de2b4
Strangerke
noreply at scummvm.org
Mon Jan 26 14:22:03 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
67d948404a M4: BURGER: review and cleanup in rooms 138 to 176
5d176d055c M4: BURGER: review and cleanup in section 2
2e770241f2 M4: BURGER: review and cleanup in section 3
4de686dddf M4: BURGER: review and cleanup in section 4
Commit: 67d948404ada744d38067bb6f5eaa980d7862501
https://github.com/scummvm/scummvm/commit/67d948404ada744d38067bb6f5eaa980d7862501
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T13:28:20+01:00
Commit Message:
M4: BURGER: review and cleanup in rooms 138 to 176
Changed paths:
engines/m4/burger/rooms/section1/room138.cpp
engines/m4/burger/rooms/section1/room140_141.cpp
engines/m4/burger/rooms/section1/room142.cpp
engines/m4/burger/rooms/section1/room145.cpp
engines/m4/burger/rooms/section1/room171.cpp
engines/m4/burger/rooms/section1/room172.cpp
engines/m4/burger/rooms/section1/room173.cpp
engines/m4/burger/rooms/section1/room174.cpp
engines/m4/burger/rooms/section1/room175.cpp
engines/m4/burger/rooms/section1/section1.cpp
diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index 8784a3cff41..35bec913aa2 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -49,39 +49,39 @@ static const char *SAID[][4] = {
};
static const seriesPlayBreak PLAY1[] = {
- { 0, 3, 0, 1, 255, -1, 0, 0, 0, 0 },
- { 4, 4, 0, 1, 255, 8, 0, 0, 0, 0 },
- { 5, -1, 0, 1, 255, 10, 0, 0, 0, 0 },
+ { 0, 3, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 4, 4, nullptr, 1, 255, 8, 0, 0, nullptr, 0 },
+ { 5, -1, nullptr, 1, 255, 10, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
static const seriesPlayBreak PLAY2[] = {
- { 0, 11, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 12, 12, "138_003", 1, 255, -1, 0, 0, 0, 0 },
- { 12, 12, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 12, 12, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 12, 12, nullptr, 1, 255, 5, 0, 0, 0, 0 },
- { 12, 12, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 11, 0, nullptr, 1, 255, -1, 0, 0, 0, 0 },
+ { 0, 11, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 12, 12, "138_003", 1, 255, -1, 0, 0, nullptr, 0 },
+ { 12, 12, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 12, 12, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 12, 12, nullptr, 1, 255, 5, 0, 0, nullptr, 0 },
+ { 12, 12, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 11, 0, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
static const seriesPlayBreak PLAY3[] = {
- { 6, 8, nullptr, 1, 255, 12, 0, 0, 0, 0 },
- { 7, 6, "138_006", 1, 255, -1, 0, 0, 0, 0 },
- { 7, 8, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 8, 6, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 6, 7, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 6, 7, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 7, 6, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 6, 8, nullptr, 1, 255, -1, 0, 0, 0, 0 },
- { 8, 6, nullptr, 1, 255, -1, 2048, 0, 0, 0 },
+ { 6, 8, nullptr, 1, 255, 12, 0, 0, nullptr, 0 },
+ { 7, 6, "138_006", 1, 255, -1, 0, 0, nullptr, 0 },
+ { 7, 8, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 8, 6, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 6, 7, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 6, 7, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 7, 6, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 6, 8, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 8, 6, nullptr, 1, 255, -1, 2048, 0, nullptr, 0 },
PLAY_BREAK_END
};
static const seriesPlayBreak PLAY4[] = {
- { 25, 5, 0, 1, 255, -1, 0, 0, 0, 0 },
- { 4, 0, 0, 1, 255, 11, 0, 0, 0, 0 },
+ { 25, 5, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 4, 0, nullptr, 1, 255, 11, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -153,7 +153,6 @@ void Room138::init() {
}
void Room138::daemon() {
- int frame;
switch (_G(kernel).trigger) {
case kCHANGE_DEPUTY_ANIMATION:
@@ -333,6 +332,9 @@ void Room138::daemon() {
}
break;
+ default:
+ break;
+
}
break;
@@ -530,7 +532,7 @@ void Room138::daemon() {
case 15:
if (_wilburShould == 15) {
loadSeries();
- frame = imath_ranged_rand(0, 4);
+ const int frame = imath_ranged_rand(0, 4);
series_play("138wi02", 0xa00, 0, kCHANGE_WILBUR_ANIMATION, 4, 0, 100, 0, 0, frame, frame);
} else {
diff --git a/engines/m4/burger/rooms/section1/room140_141.cpp b/engines/m4/burger/rooms/section1/room140_141.cpp
index 0103917cffe..73246ad89aa 100644
--- a/engines/m4/burger/rooms/section1/room140_141.cpp
+++ b/engines/m4/burger/rooms/section1/room140_141.cpp
@@ -116,8 +116,8 @@ static const seriesStreamBreak SERIES1[] = {
};
static const seriesStreamBreak SERIES2[] = {
- { 5, "141_007", 1, 255, -1, 0, 0, 0 },
- { 9, 0, 2, 255, 3, 0, 0, 0 },
+ { 5, "141_007", 1, 255, -1, 0, nullptr, 0 },
+ { 9, nullptr, 2, 255, 3, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -663,7 +663,14 @@ void Room140_141::daemon() {
digi_unload("141_002");
digi_unload("141_003");
break;
+
+ default:
+ break;
}
+ break;
+
+ default:
+ break;
}
break;
@@ -673,14 +680,14 @@ void Room140_141::daemon() {
switch (_wilburShould) {
case 50:
_wilburShould = 51;
- _flag2 = 1;
+ _flag2 = true;
digi_preload_stream_breaks(&SERIES4[0]);
series_stream_with_breaks(&SERIES4[0], _G(flags)[V000] == 1002 ? "141wi01" : "140wi01",
6, 0xf00, kCHANGE_WILBUR_ANIMATION);
break;
case 51:
- _flag2 = 0;
+ _flag2 = false;
_series2 = series_play(_G(flags)[V000] == 1002 ? "141wave" : "140wave",
0xf00, 0, -1, 10, -1, 100, 0, 0, 0, 3);
_wilburShould = 52;
@@ -709,7 +716,7 @@ void Room140_141::daemon() {
case 55:
terminateMachineAndNull(_series2);
- _flag2 = 1;
+ _flag2 = true;
series_stream_with_breaks(SERIES3, _G(flags)[V000] == 1002 ? "141wi03" : "140wi03",
10, 0xf00, 18);
@@ -717,7 +724,7 @@ void Room140_141::daemon() {
case 56:
terminateMachineAndNull(_series2);
- _flag2 = 1;
+ _flag2 = true;
series_stream_with_breaks(SERIES3, _G(flags)[V000] == 1002 ? "141wi03" : "140wi03",
6, 0xf00, 18);
@@ -843,7 +850,7 @@ void Room140_141::daemon() {
break;
case kWILBUR_SPEECH_STARTED:
- _G(kernel).continue_handling_trigger = 1;
+ _G(kernel).continue_handling_trigger = true;
_wilburShould = 53;
break;
@@ -854,7 +861,7 @@ void Room140_141::daemon() {
}
void Room140_141::parser() {
- bool lookFlag = player_said("look") || player_said("look at");
+ const bool lookFlag = player_said("look") || player_said("look at");
if (player_said("conv20")) {
conv20();
@@ -910,9 +917,9 @@ done:
void Room140_141::conv20() {
_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 == 21) {
if (who <= 0) {
diff --git a/engines/m4/burger/rooms/section1/room142.cpp b/engines/m4/burger/rooms/section1/room142.cpp
index 603bd3fb574..a973c1db0b6 100644
--- a/engines/m4/burger/rooms/section1/room142.cpp
+++ b/engines/m4/burger/rooms/section1/room142.cpp
@@ -127,7 +127,7 @@ const seriesPlayBreak Room142::PLAY9[] = {
};
const seriesPlayBreak Room142::PLAY10[] = {
- { 3, 0, "142_002", 1, 255, -1, 0, 0, 0, 0 },
+ { 3, 0, "142_002", 1, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -138,7 +138,7 @@ const seriesPlayBreak Room142::PLAY11[] = {
};
const seriesPlayBreak Room142::PLAY12[] = {
- { 0, -1, "142_005", 1, 255, -1, 0, 0, 0, 0 },
+ { 0, -1, "142_005", 1, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -152,7 +152,7 @@ const seriesPlayBreak Room142::PLAY13[] = {
};
const seriesPlayBreak Room142::PLAY14[] = {
- { 0, 19, "142_007", 2, 255, -1, 0, 0, 0, 0 },
+ { 0, 19, "142_007", 2, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
diff --git a/engines/m4/burger/rooms/section1/room145.cpp b/engines/m4/burger/rooms/section1/room145.cpp
index ee2dbc4d641..9b750d0d1c4 100644
--- a/engines/m4/burger/rooms/section1/room145.cpp
+++ b/engines/m4/burger/rooms/section1/room145.cpp
@@ -51,22 +51,22 @@ const char *Room145::SAID[][4] = {
};
const WilburMatch Room145::MATCH[] = {
- { nullptr, "TOUR BUS", 1, 0, 0, &_state1, 12 },
- { "TALK", "ROXY", 10016, 0, 0, &Vars::_wilbur_should, 11 },
- { "AMPLIFIER", "ROXY", 1, 0, 0, &_state1, 15 },
- { nullptr, "ROXY", 1, 0, 0, &_state1, 17 },
- { "TALK" , "DRUMZ", kSPEAK_TO_DRUMZ, 0, 0, 0, 0 },
- { "LAXATIVE" , "DRUMZ", 10016, 0, 0, &Vars::_wilbur_should, 3 },
- { nullptr, "DRUMZ", 1, 0, 0, &_state1, 16 },
- { "TALK" , "VIPE", 10016, 0, 0, &Vars::_wilbur_should, 10 },
- { "AMPLIFIER", "VIPE", 1, 0, 0, &_state1, 15 },
- { nullptr, "VIPE", 1, 0, 0, &_state1, 16 },
- { "AMPLIFIER" , "INSTRUMENTS", 1, 0, 0, &_state1, 13 },
- { nullptr, "INSTRUMENTS", 1, 0, 0, &_state1, 14 },
+ { nullptr, "TOUR BUS", 1, nullptr, 0, &_state1, 12 },
+ { "TALK", "ROXY", 10016, nullptr, 0, &Vars::_wilbur_should, 11 },
+ { "AMPLIFIER", "ROXY", 1, nullptr, 0, &_state1, 15 },
+ { nullptr, "ROXY", 1, nullptr, 0, &_state1, 17 },
+ { "TALK" , "DRUMZ", kSPEAK_TO_DRUMZ, nullptr, 0, 0, 0 },
+ { "LAXATIVE" , "DRUMZ", 10016, nullptr, 0, &Vars::_wilbur_should, 3 },
+ { nullptr, "DRUMZ", 1, nullptr, 0, &_state1, 16 },
+ { "TALK" , "VIPE", 10016, nullptr, 0, &Vars::_wilbur_should, 10 },
+ { "AMPLIFIER", "VIPE", 1, nullptr, 0, &_state1, 15 },
+ { nullptr, "VIPE", 1, nullptr, 0, &_state1, 16 },
+ { "AMPLIFIER" , "INSTRUMENTS", 1, nullptr, 0, &_state1, 13 },
+ { nullptr, "INSTRUMENTS", 1, nullptr, 0, &_state1, 14 },
{ "TAKE", "AMPLIFIER ", 10016, &Flags::_flags[kDrumzFled], 0, &Vars::_wilbur_should, 1 },
{ "TAKE", "AMPLIFIER ", 10016, &Flags::_flags[kDrumzFled], 1, &Vars::_wilbur_should, 8 },
- { nullptr, "AMPLIFIER ", 1, 0, 0, &_state1, 14 },
- { nullptr, "MAP", 1, 0, 0, &_state1, 18 },
+ { nullptr, "AMPLIFIER ", 1, nullptr, 0, &_state1, 14 },
+ { nullptr, "MAP", 1, nullptr, 0, &_state1, 18 },
WILBUR_MATCH_END
};
@@ -809,9 +809,9 @@ void Room145::loadRx() {
void Room145::conv21() {
const char *sound = conv_sound_to_play();
- 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 (sound) {
if (who == 1) {
@@ -858,7 +858,7 @@ void Room145::conv21() {
void Room145::conv22() {
const char *sound = conv_sound_to_play();
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (sound) {
if (who == 1)
@@ -870,9 +870,9 @@ void Room145::conv22() {
void Room145::conv23() {
const char *sound = conv_sound_to_play();
- 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 (sound) {
if (who == 1) {
diff --git a/engines/m4/burger/rooms/section1/room171.cpp b/engines/m4/burger/rooms/section1/room171.cpp
index eb5aabf9978..f678445b3bc 100644
--- a/engines/m4/burger/rooms/section1/room171.cpp
+++ b/engines/m4/burger/rooms/section1/room171.cpp
@@ -52,20 +52,20 @@ static const char *SAID[][4] = {
};
const seriesPlayBreak Room171::PLAY1[] = {
- { 0, 2, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 3, 6, "171_014a", 1, 100, -1, 0, 0, 0, 0 },
- { 7, 12, "171_014b", 1, 100, -1, 0, 0, 0, 0 },
- { 13, 18, "171_014a", 1, 100, -1, 0, 0, 0, 0 },
- { 19, 22, "171_014b", 1, 100, -1, 0, 0, 0, 0 },
- { 23, 27, "171_014a", 1, 100, -1, 0, 0, 0, 0 },
- { 28, 32, "171_014b", 1, 100, -1, 0, 0, 0, 0 },
- { 33, 39, "171_014a", 1, 100, -1, 0, 0, 0, 0 },
- { 40, -1, "171_014b", 1, 100, -1, 0, 0, 0, 0 },
+ { 0, 2, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 3, 6, "171_014a", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 7, 12, "171_014b", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 13, 18, "171_014a", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 19, 22, "171_014b", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 23, 27, "171_014a", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 28, 32, "171_014b", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 33, 39, "171_014a", 1, 100, -1, 0, 0, nullptr, 0 },
+ { 40, -1, "171_014b", 1, 100, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY2[] = {
- { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, 0, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
{ 1, 6, "171_014a", 2, 100, -1, 0, 0, &Flags::_flags[V086], 0 },
{ 7, 12, "171_014b", 2, 100, -1, 0, 0, &Flags::_flags[V086], 0 },
{ 13, 17, "171_014a", 2, 100, -1, 0, 0, &Flags::_flags[V086], 0 },
@@ -86,88 +86,88 @@ const seriesPlayBreak Room171::PLAY2[] = {
};
const seriesPlayBreak Room171::PLAY3[] = {
- { 0, 4, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 5, 16, 0, 0, 0, 3, 0, 0, 0, 0 },
+ { 0, 4, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 5, 16, nullptr, 0, 0, 3, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY4[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY5[] = {
- { 0, -1, "171_001", 2, 255, -1, 0, 0, 0, 0 },
+ { 0, -1, "171_001", 2, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY6[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY7[] = {
- { 0, -1, 0, 2, 0, -1, 2048, 0, 0, 0 },
+ { 0, -1, nullptr, 2, 0, -1, 2048, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY8[] = {
- { 0, 4, "171_011", 2, 255, -1, 0, 0, 0, 0 },
- { 5, 19, 0, 0, 0, 3, 0, 0, 0, 0 },
- { 20, 25, "171_012", 2, 255, -1, 0, 0, 0, 0 },
- { 26, 33, "171_010", 2, 255, -1, 0, 0, 0, 0 },
+ { 0, 4, "171_011", 2, 255, -1, 0, 0, nullptr, 0 },
+ { 5, 19, nullptr, 0, 0, 3, 0, 0, nullptr, 0 },
+ { 20, 25, "171_012", 2, 255, -1, 0, 0, nullptr, 0 },
+ { 26, 33, "171_010", 2, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY9[] = {
- { 34, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 34, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY10[] = {
- { 7, 8, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 8, 8, 0, 0, 0, -1, 0, 2, 0, 0 },
- { 7, 8, 0, 0, 0, -1, 2, 0, 0, 0 },
+ { 7, 8, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 8, 8, nullptr, 0, 0, -1, 0, 2, nullptr, 0 },
+ { 7, 8, nullptr, 0, 0, -1, 2, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY11[] = {
- { 7, 12, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 13, -1, "171_006", 2, 255, -1, 0, 0, 0, 0 },
+ { 7, 12, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 13, -1, "171_006", 2, 255, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY12[] = {
- { 0, 4, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 4, 4, 0, 0, 0, -1, 0, 10, 0, 0 },
- { 0, 4, 0, 0, 0, -1, 2, 0, 0, 0 },
+ { 0, 4, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 4, 4, nullptr, 0, 0, -1, 0, 10, nullptr, 0 },
+ { 0, 4, nullptr, 0, 0, -1, 2, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY13[] = {
- { 0, -1, 0, 0, 0, -1, 1, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 1, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY14[] = {
- { 0, 17, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 18, -1, "171_004", 2, 255, -1, 0, 0, 0, 0 },
- { 0, 11, 0, 0, 0, -1, 2, 0, 0, 0 },
+ { 0, 17, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 18, -1, "171_004", 2, 255, -1, 0, 0, nullptr, 0 },
+ { 0, 11, nullptr, 0, 0, -1, 2, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY15[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY16[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room171::PLAY17[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -363,7 +363,7 @@ void Room171::daemon() {
case 8:
_pollyShould = 9;
- npc_say(conv_sound_to_play(), 5, "171ap02", 0x300, 1, 17, 22);
+ npc_say(conv_sound_to_play(), 5, "171ap02", 0x300, true, 17, 22);
break;
case 9:
@@ -786,9 +786,9 @@ void Room171::frontDoor() {
}
void Room171::conv40() {
- 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 (!conv_sound_to_play())
return;
diff --git a/engines/m4/burger/rooms/section1/room172.cpp b/engines/m4/burger/rooms/section1/room172.cpp
index a326d619794..78b74d330b3 100644
--- a/engines/m4/burger/rooms/section1/room172.cpp
+++ b/engines/m4/burger/rooms/section1/room172.cpp
@@ -421,9 +421,9 @@ void Room172::loadSeries7() {
void Room172::conv41() {
const char *sound = conv_sound_to_play();
- 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 (sound) {
if (who == 1) {
diff --git a/engines/m4/burger/rooms/section1/room173.cpp b/engines/m4/burger/rooms/section1/room173.cpp
index cc8d85c13b5..689aebf815d 100644
--- a/engines/m4/burger/rooms/section1/room173.cpp
+++ b/engines/m4/burger/rooms/section1/room173.cpp
@@ -22,7 +22,6 @@
#include "m4/burger/rooms/section1/room173.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/room174.cpp b/engines/m4/burger/rooms/section1/room174.cpp
index 380389624eb..b21f241a70e 100644
--- a/engines/m4/burger/rooms/section1/room174.cpp
+++ b/engines/m4/burger/rooms/section1/room174.cpp
@@ -51,7 +51,7 @@ static const seriesPlayBreak PLAY1[] = {
};
static const seriesPlayBreak PLAY2[] = {
- { 0, 18, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, 18, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
diff --git a/engines/m4/burger/rooms/section1/room175.cpp b/engines/m4/burger/rooms/section1/room175.cpp
index faddbc4c993..bb77a84b086 100644
--- a/engines/m4/burger/rooms/section1/room175.cpp
+++ b/engines/m4/burger/rooms/section1/room175.cpp
@@ -56,7 +56,7 @@ static const seriesPlayBreak PLAY2[] = {
};
static const seriesPlayBreak PLAY3[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
diff --git a/engines/m4/burger/rooms/section1/section1.cpp b/engines/m4/burger/rooms/section1/section1.cpp
index f1bc124dad4..60ec88209b5 100644
--- a/engines/m4/burger/rooms/section1/section1.cpp
+++ b/engines/m4/burger/rooms/section1/section1.cpp
@@ -181,7 +181,7 @@ void Section1::daemon() {
break;
case 1029:
if (_state1 == 2) {
- int frame = imath_ranged_rand(9, 12);
+ const int frame = imath_ranged_rand(9, 12);
series_play("110bu01", 0, 0, 1029, 5, 0, 100, 0, 0, frame, frame);
} else {
pal_fade_set_start(_G(master_palette), 0);
@@ -205,7 +205,7 @@ void Section1::daemon() {
break;
case 1033:
if (_state1 == 2) {
- int frame = imath_ranged_rand(0, 4);
+ const int frame = imath_ranged_rand(0, 4);
series_play("110bu02", 0, 0, 1033, 5, 0, 100, 0, 0, frame, frame);
} else {
series_play("110bu02", 0, 0, 1035, 5, 0, 100, 0, 0, 5, 16);
Commit: 5d176d055c0687b20d25f64559d4d0817d06c3b5
https://github.com/scummvm/scummvm/commit/5d176d055c0687b20d25f64559d4d0817d06c3b5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T13:31:33+01:00
Commit Message:
M4: BURGER: review and cleanup in section 2
Changed paths:
engines/m4/burger/rooms/section2/room204.cpp
diff --git a/engines/m4/burger/rooms/section2/room204.cpp b/engines/m4/burger/rooms/section2/room204.cpp
index 6da2f619a5a..14f65da8fbe 100644
--- a/engines/m4/burger/rooms/section2/room204.cpp
+++ b/engines/m4/burger/rooms/section2/room204.cpp
@@ -27,7 +27,7 @@ namespace Burger {
namespace Rooms {
const seriesPlayBreak Room204::PLAY1[] = {
- { 0, 2, 0, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 0, 2, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
Commit: 2e770241f2a008863ca2973df4bf143a9e085acd
https://github.com/scummvm/scummvm/commit/2e770241f2a008863ca2973df4bf143a9e085acd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T14:21:15+01:00
Commit Message:
M4: BURGER: review and cleanup in section 3
Changed paths:
engines/m4/burger/rooms/section3/room302.cpp
engines/m4/burger/rooms/section3/room303.cpp
engines/m4/burger/rooms/section3/room305.cpp
engines/m4/burger/rooms/section3/section3_room.cpp
diff --git a/engines/m4/burger/rooms/section3/room302.cpp b/engines/m4/burger/rooms/section3/room302.cpp
index 7f2d59b5dde..2c0316c1c82 100644
--- a/engines/m4/burger/rooms/section3/room302.cpp
+++ b/engines/m4/burger/rooms/section3/room302.cpp
@@ -253,7 +253,7 @@ void Room302::daemon() {
case 2:
ws_unhide_walker();
- ws_walk(500, 250, nullptr, 3, 8, 1);
+ ws_walk(500, 250, nullptr, 3, 8, true);
break;
case 3:
diff --git a/engines/m4/burger/rooms/section3/room303.cpp b/engines/m4/burger/rooms/section3/room303.cpp
index 770f45bdfa4..da6fd9a4cef 100644
--- a/engines/m4/burger/rooms/section3/room303.cpp
+++ b/engines/m4/burger/rooms/section3/room303.cpp
@@ -48,13 +48,13 @@ const char *Room303::SAID[][4] = {
};
const seriesStreamBreak Room303::SERIES1[] = {
- { 0, "303_001", 2, 255, -1, 0, 0, 0 },
+ { 0, "303_001", 2, 255, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
const seriesPlayBreak Room303::PLAY1[] = {
- { 0, 7, 0, 1, 0, -1, 2048, 0, 0, 0 },
- { 8, -1, 0, 1, 0, 9, 2048, 0, 0, 0 },
+ { 0, 7, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
+ { 8, -1, nullptr, 1, 0, 9, 2048, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -340,6 +340,10 @@ void Room303::doDaemon(int trigger) {
}
if (_G(wilbur_should) == 20)
kernel_trigger_dispatch_now(kCHANGE_WILBUR_ANIMATION);
+ break;
+
+ default:
+ break;
}
break;
diff --git a/engines/m4/burger/rooms/section3/room305.cpp b/engines/m4/burger/rooms/section3/room305.cpp
index 3de2825fee1..a19af1c9e6f 100644
--- a/engines/m4/burger/rooms/section3/room305.cpp
+++ b/engines/m4/burger/rooms/section3/room305.cpp
@@ -51,17 +51,17 @@ const seriesStreamBreak Room305::SERIES1[] = {
{ 72, nullptr, 2, 0, -1, 2048, nullptr, 0 },
{ 79, "305_004", 2, 255, -1, 0, nullptr, 0 },
{ 94, "305_002", 2, 255, -1, 0, nullptr, 0 },
- { -1, 0, 0, 0, -1, 0, 0, 0 },
+ { -1, nullptr, 0, 0, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
const seriesPlayBreak Room305::PLAY1[] = {
- { 0, -1, nullptr, 1, 0, -1, 2048, 0, 0, 0 },
+ { 0, -1, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room305::PLAY2[] = {
- { 0, -1, 0, 1, 0, -1, 2048, 0, 0, 0 },
+ { 0, -1, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
PLAY_BREAK_END
};
diff --git a/engines/m4/burger/rooms/section3/section3_room.cpp b/engines/m4/burger/rooms/section3/section3_room.cpp
index bfab4c4802e..9b5dd786516 100644
--- a/engines/m4/burger/rooms/section3/section3_room.cpp
+++ b/engines/m4/burger/rooms/section3/section3_room.cpp
@@ -53,9 +53,9 @@ void Section3Room::set_palette_brightness(int start, int finish, int percent) {
RGB8 *pal = &_G(master_palette)[start];
for (int index = start; index < finish; ++index, ++pal) {
- int r = (double)pal->r * (double)percent / (double)100;
- int g = (double)pal->g * (double)percent / (double)100;
- int b = (double)pal->b * (double)percent / (double)100;
+ const int r = (double)pal->r * (double)percent / (double)100;
+ const int g = (double)pal->g * (double)percent / (double)100;
+ const int b = (double)pal->b * (double)percent / (double)100;
pal->r = CLIP(r, 0, 255);
pal->g = CLIP(g, 0, 255);
Commit: 4de686dddf5bb14a69fd07308770107a026de2b4
https://github.com/scummvm/scummvm/commit/4de686dddf5bb14a69fd07308770107a026de2b4
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T15:05:03+01:00
Commit Message:
M4: BURGER: review and cleanup in section 4
Changed paths:
engines/m4/burger/rooms/section4/room401.cpp
engines/m4/burger/rooms/section4/room402.cpp
engines/m4/burger/rooms/section4/room405.cpp
engines/m4/burger/rooms/section4/room406.cpp
engines/m4/burger/rooms/section4/room407.cpp
diff --git a/engines/m4/burger/rooms/section4/room401.cpp b/engines/m4/burger/rooms/section4/room401.cpp
index 08d981a4c44..89b530d3b73 100644
--- a/engines/m4/burger/rooms/section4/room401.cpp
+++ b/engines/m4/burger/rooms/section4/room401.cpp
@@ -27,9 +27,9 @@ namespace Burger {
namespace Rooms {
const seriesStreamBreak Room401::SERIES1[] = {
- { 7, "401v001", 1, 255, -1, 0, 0, 0 },
- { 36, "401A_002", 2, 200, -1, 0, 0, 0 },
- { 89, nullptr, 0, 0, 9, 0, 0, 0 },
+ { 7, "401v001", 1, 255, -1, 0, nullptr, 0 },
+ { 36, "401A_002", 2, 200, -1, 0, nullptr, 0 },
+ { 89, nullptr, 0, 0, 9, 0, nullptr, 0 },
STREAM_BREAK_END
};
diff --git a/engines/m4/burger/rooms/section4/room402.cpp b/engines/m4/burger/rooms/section4/room402.cpp
index 80767d6f603..afe1be4f564 100644
--- a/engines/m4/burger/rooms/section4/room402.cpp
+++ b/engines/m4/burger/rooms/section4/room402.cpp
@@ -873,7 +873,7 @@ void Room402::pre_parser() {
}
void Room402::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(SAID)) {
@@ -1079,9 +1079,9 @@ void Room402::parser() {
}
void Room402::conv84() {
- int who = conv_whos_talking();
- int entry = conv_current_entry();
- int node = conv_current_node();
+ const int who = conv_whos_talking();
+ const int entry = conv_current_entry();
+ const int node = conv_current_node();
const char *sound = conv_sound_to_play();
_G(kernel).trigger_mode = KT_PARSE;
diff --git a/engines/m4/burger/rooms/section4/room405.cpp b/engines/m4/burger/rooms/section4/room405.cpp
index 31fc98da4a7..4436f669eda 100644
--- a/engines/m4/burger/rooms/section4/room405.cpp
+++ b/engines/m4/burger/rooms/section4/room405.cpp
@@ -369,6 +369,8 @@ void Room405::daemon() {
kernel_trigger_dispatch_now(kCHANGE_VIPE_ANIMATION);
break;
+ default:
+ break;
}
break;
@@ -927,7 +929,7 @@ void Room405::pre_parser() {
}
void Room405::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("conv86")) {
@@ -1092,7 +1094,7 @@ void Room405::parser() {
void Room405::conv86() {
_G(kernel).trigger_mode = KT_PARSE;
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
const char *sound = conv_sound_to_play();
if (_G(kernel).trigger == 18) {
@@ -1137,9 +1139,9 @@ void Room405::conv86() {
void Room405::conv89() {
_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();
const char *sound = conv_sound_to_play();
if (_G(kernel).trigger == 18) {
@@ -1189,7 +1191,7 @@ void Room405::conv89() {
void Room405::conv90() {
_G(kernel).trigger_mode = KT_PARSE;
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
const char *sound = conv_sound_to_play();
if (_G(kernel).trigger == 18) {
@@ -1222,7 +1224,7 @@ void Room405::conv90() {
void Room405::conv91() {
_G(kernel).trigger_mode = KT_PARSE;
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
const char *sound = conv_sound_to_play();
if (_G(kernel).trigger == 18) {
@@ -1255,9 +1257,9 @@ void Room405::conv91() {
void Room405::conv92() {
_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();
const char *sound = conv_sound_to_play();
if (_G(kernel).trigger == 18) {
diff --git a/engines/m4/burger/rooms/section4/room406.cpp b/engines/m4/burger/rooms/section4/room406.cpp
index 3e6110e2637..d223145078e 100644
--- a/engines/m4/burger/rooms/section4/room406.cpp
+++ b/engines/m4/burger/rooms/section4/room406.cpp
@@ -22,7 +22,6 @@
#include "m4/burger/rooms/section4/room406.h"
#include "m4/burger/burger.h"
#include "m4/burger/vars.h"
-#include "m4/burger/burger.h"
namespace M4 {
namespace Burger {
@@ -64,19 +63,19 @@ const char *Room406::SAID[][4] = {
};
const WilburMatch Room406::MATCH[] = {
- { "FISH", "PEGLEG", 8, 0, 0, &_state4, 48 },
- { "FISH", "PEGLEG ", 8, 0, 0, &_state4, 48 },
- { "FISH", "TIRE", 10016, 0, 0, &Vars::_wilbur_should, 2 },
+ { "FISH", "PEGLEG", 8, nullptr, 0, &_state4, 48 },
+ { "FISH", "PEGLEG ", 8, nullptr, 0, &_state4, 48 },
+ { "FISH", "TIRE", 10016, nullptr, 0, &Vars::_wilbur_should, 2 },
{ "GEAR", "GATE", 8, &Flags::_flags[V172], 10025, &_state4, 25 },
- { "GEAR", "GATE", 8, 0, 0, &_state4, 26 },
+ { "GEAR", "GATE", 8, nullptr, 0, &_state4, 26 },
{ "JAWZ O' LIFE", "GATE", 10016, &Flags::_flags[V172], 10025, &Vars::_wilbur_should, 16 },
- { "JAWZ O' LIFE", "GATE", 8, 0, 0, &_state4, 27 },
+ { "JAWZ O' LIFE", "GATE", 8, nullptr, 0, &_state4, 27 },
{ "JAWZ O' LIFE", "LOCK", 10016, &Flags::_flags[V172], 10025, &Vars::_wilbur_should, 16 },
- { "JAWZ O' LIFE", "LOCK", 8, 0, 0, &_state4, 27 },
+ { "JAWZ O' LIFE", "LOCK", 8, nullptr, 0, &_state4, 27 },
{ "JAWZ O' LIFE", "CHAIN", 10016, &Flags::_flags[V172], 10025, &Vars::_wilbur_should, 16 },
- { "JAWZ O' LIFE", "CHAIN", 8, 0, 0, &_state4, 27 },
- { "TAKE", "DOG COLLAR ", 10016, 0, 0, &Vars::_wilbur_should, 20 },
- { "TAKE", "DOG COLLAR ", 10016, 0, 0, &Vars::_wilbur_should, 18 },
+ { "JAWZ O' LIFE", "CHAIN", 8, nullptr, 0, &_state4, 27 },
+ { "TAKE", "DOG COLLAR ", 10016, nullptr, 0, &Vars::_wilbur_should, 20 },
+ { "TAKE", "DOG COLLAR ", 10016, nullptr, 0, &Vars::_wilbur_should, 18 },
{ "GEAR", "WINCH", 8, &Flags::_flags[V175], 0, &_state4, 36 },
{ "GEAR", "WINCH", 10016, &Flags::_flags[V174], 4000, &Vars::_wilbur_should, 3 },
{ "GEAR", "WINCH", 10016, &Flags::_flags[V174], 4001, &Vars::_wilbur_should, 4 },
@@ -87,15 +86,15 @@ const WilburMatch Room406::MATCH[] = {
{ "GEAR", "LEVER ", 10016, &Flags::_flags[V174], 4001, &Vars::_wilbur_should, 4 },
{ "GEAR", "LEVER ", 8, &Flags::_flags[V174], 4002, &_state4, 34 },
{ "GEAR", "LEVER", 8, &Flags::_flags[V174], 4004, &_state4, 35 },
- { "LOOK AT", "HOOK ", 8, 0, 0, &_state4, 29 },
- { "LOOK AT", "HOOK ", 8, 0, 0, &_state4, 29 },
- { "LOOK AT", "HOOK ", 8, 0, 0, &_state4, 30 },
- { "LOOK AT", "HOOK ", 8, 0, 0, &_state4, 29 },
+ { "LOOK AT", "HOOK ", 8, nullptr, 0, &_state4, 29 },
+ { "LOOK AT", "HOOK ", 8, nullptr, 0, &_state4, 29 },
+ { "LOOK AT", "HOOK ", 8, nullptr, 0, &_state4, 30 },
+ { "LOOK AT", "HOOK ", 8, nullptr, 0, &_state4, 29 },
{ "TAKE", "HOOK ", 8, &Flags::_flags[V175], 0, &_state4, 36 },
- { "TAKE", "HOOK ", 8, 0, 0, &_state4, 31 },
- { "TAKE", "HOOK ", 10016, 0, 0, &Vars::_wilbur_should, 6 },
- { "TAKE", "HOOK ", 8, 0, 0, &_state4, 32 },
- { "LOOK AT", "JAIL CELL", 8, 0, 0, &_state4, 33 },
+ { "TAKE", "HOOK ", 8, nullptr, 0, &_state4, 31 },
+ { "TAKE", "HOOK ", 10016, nullptr, 0, &Vars::_wilbur_should, 6 },
+ { "TAKE", "HOOK ", 8, nullptr, 0, &_state4, 32 },
+ { "LOOK AT", "JAIL CELL", 8, nullptr, 0, &_state4, 33 },
{ "GEAR", "TOW TRUCK", 8, &Flags::_flags[V175], 0, &_state4, 36 },
{ "GEAR", "TOW TRUCK", 8, &Flags::_flags[V175], 1, &_state4, 39 },
{ "TAKE", "TIRE ", 8, &Flags::_flags[V175], 0, &_state4, 36 },
diff --git a/engines/m4/burger/rooms/section4/room407.cpp b/engines/m4/burger/rooms/section4/room407.cpp
index 1543033c2be..b46e7576758 100644
--- a/engines/m4/burger/rooms/section4/room407.cpp
+++ b/engines/m4/burger/rooms/section4/room407.cpp
@@ -43,113 +43,113 @@ const char *Room407::SAID[][4] = {
};
const WilburMatch Room407::MATCH[] = {
- { "TALK", "DRUMZ", 11, 0, 0, nullptr, 0 },
- { "AMPLIFIER", "DRUMZ", 4, 0, 0, &_speechNum, 4 },
- { nullptr, "DRUMZ", 4, 0, 0, &_speechNum, 7 },
- { "LOOK AT", "ROXY", 10016, 0, 0, &Vars::_wilbur_should, 1 },
- { "TALK", "ROXY", 10016, 0, 0, &Vars::_wilbur_should, 2 },
- { "AMPLIFIER", "ROXY", 4, 0, 0, &_speechNum, 4 },
- { "DOG COLLAR", "ROXY", 4, 0, 0, &_speechNum, 5 },
- { nullptr, "ROXY", 4, 0, 0, &_speechNum, 6 },
- { "AMPLIFIER", "INSTRUMENTS", 4, 0, 0, &_speechNum, 8 },
- { nullptr, "INSTRUMENTS", 4, 0, 0, &_speechNum, 9 },
- { nullptr, "TOUR BUS", 4, 0, 0, &_speechNum, 3 },
- { nullptr, nullptr, -1, 0, 0, nullptr, 0 }
+ { "TALK", "DRUMZ", 11, nullptr, 0, nullptr, 0 },
+ { "AMPLIFIER", "DRUMZ", 4, nullptr, 0, &_speechNum, 4 },
+ { nullptr, "DRUMZ", 4, nullptr, 0, &_speechNum, 7 },
+ { "LOOK AT", "ROXY", 10016, nullptr, 0, &Vars::_wilbur_should, 1 },
+ { "TALK", "ROXY", 10016, nullptr, 0, &Vars::_wilbur_should, 2 },
+ { "AMPLIFIER", "ROXY", 4, nullptr, 0, &_speechNum, 4 },
+ { "DOG COLLAR", "ROXY", 4, nullptr, 0, &_speechNum, 5 },
+ { nullptr, "ROXY", 4, nullptr, 0, &_speechNum, 6 },
+ { "AMPLIFIER", "INSTRUMENTS", 4, nullptr, 0, &_speechNum, 8 },
+ { nullptr, "INSTRUMENTS", 4, nullptr, 0, &_speechNum, 9 },
+ { nullptr, "TOUR BUS", 4, nullptr, 0, &_speechNum, 3 },
+ { nullptr, nullptr, -1, nullptr, 0, nullptr, 0 }
};
const seriesPlayBreak Room407::PLAY1[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY2[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY3[] = {
- { 0, 1, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 2, -1, 0, 0, 0, -1, 0, 4, 0, 0 },
- { 0, 1, 0, 0, 0, -1, 2, 0, 0, 0 },
+ { 0, 1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 2, -1, nullptr, 0, 0, -1, 0, 4, nullptr, 0 },
+ { 0, 1, nullptr, 0, 0, -1, 2, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY4[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY5[] = {
- { 0, -1, "145_004", 2, 255, -1, 1, 0, 0, 0 },
+ { 0, -1, "145_004", 2, 255, -1, 1, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY6[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY7[] = {
- { 0, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY8[] = {
- { 0, -1, "407r901", 1, 255, -1, 4, -1, 0, 0 },
+ { 0, -1, "407r901", 1, 255, -1, 4, -1, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY9[] = {
- { 0, -1, "407r903", 1, 255, -1, 4, -1, 0, 0 },
+ { 0, -1, "407r903", 1, 255, -1, 4, -1, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY10[] = {
- { 0, -1, 0, 0, 0, -1, 2, 0, 0, 0 },
+ { 0, -1, nullptr, 0, 0, -1, 2, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY11[] = {
- { 0, 2, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 3, -1, "407r904x", 1, 255, -1, 4, -1, 0, 0 },
+ { 0, 2, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 3, -1, "407r904x", 1, 255, -1, 4, -1, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY12[] = {
- { 0, 6, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, 6, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY13[] = {
- { 7, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 7, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY14[] = {
- { 0, -1, "407r904y", 1, 255, -1, 4, -1, 0, 0 },
+ { 0, -1, "407r904y", 1, 255, -1, 4, -1, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY15[] = {
- { 0, 3, "407v901", 1, 255, -1, 4, -1, 0, 0 },
+ { 0, 3, "407v901", 1, 255, -1, 4, -1, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY16[] = {
- { 5, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 5, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY17[] = {
- { 1, -1, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 1, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room407::PLAY18[] = {
- { 0, 1, "999_003", 1, 255, -1, 0, 0, 0, 0 },
- { 2, 9, 0, 0, 0, 7, 0, 0, 0, 0 },
- { 10, 11, "999_003", 1, 255, -1, 0, 0, 0, 0 },
- { 12, -1, 0, 0, 0, 9, 0, 0, 0, 0 },
+ { 0, 1, "999_003", 1, 255, -1, 0, 0, nullptr, 0 },
+ { 2, 9, nullptr, 0, 0, 7, 0, 0, nullptr, 0 },
+ { 10, 11, "999_003", 1, 255, -1, 0, 0, nullptr, 0 },
+ { 12, -1, nullptr, 0, 0, 9, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -263,7 +263,7 @@ void Room407::daemon() {
if (_roxyState) {
kernel_timing_trigger(120, 7);
} else {
- int rnd = imath_ranged_rand(1, 25);
+ const int rnd = imath_ranged_rand(1, 25);
if (rnd >= 16)
_digiName = "407r902a";
else
@@ -642,7 +642,7 @@ void Room407::loadSeries() {
void Room407::conv87() {
const char *sound = conv_sound_to_play();
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (sound) {
if (who == 1)
@@ -654,9 +654,9 @@ void Room407::conv87() {
void Room407::conv88() {
const char *sound = conv_sound_to_play();
- 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 (sound) {
if (who == 1) {
More information about the Scummvm-git-logs
mailing list