[Scummvm-git-logs] scummvm master -> ef0a76c5a3faa36313f97da30dc28a8a220e2ef3
Strangerke
noreply at scummvm.org
Tue Jan 27 10:08:41 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
4cea4c3b7b M4: BURGER: Review and cleanup of section 7
523cecf636 M4: BURGER: Review and cleanup of section 8
ef0a76c5a3 M4: BURGER: Review and cleanup of section 9
Commit: 4cea4c3b7b2b7c54fcd6b76b5c024ce3f4e93dbf
https://github.com/scummvm/scummvm/commit/4cea4c3b7b2b7c54fcd6b76b5c024ce3f4e93dbf
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-27T10:37:23+01:00
Commit Message:
M4: BURGER: Review and cleanup of section 7
Changed paths:
engines/m4/burger/rooms/section7/room701.cpp
engines/m4/burger/rooms/section7/room706.cpp
engines/m4/burger/rooms/section7/section7.cpp
diff --git a/engines/m4/burger/rooms/section7/room701.cpp b/engines/m4/burger/rooms/section7/room701.cpp
index 098ed39d415..60ae7586f4d 100644
--- a/engines/m4/burger/rooms/section7/room701.cpp
+++ b/engines/m4/burger/rooms/section7/room701.cpp
@@ -28,44 +28,44 @@ namespace Burger {
namespace Rooms {
static const seriesStreamBreak SERIES1[] = {
- { 0, "700Z001", 1, 255, -1, 0, 0, 0 },
- { 64, "700A_001", 2, 200, -1, 0, 0, 0 },
- { 66, "700W001", 1, 255, -1, 0, 0, 0 },
- { 68, "700F001", 2, 255, -1, 0, 0, 0 },
- { 92, "700A_002", 2, 255, -1, 0, 0, 0 },
- { 96, "700Z002", 1, 255, -1, 0, 0, 0 },
- { 130, "700F002", 1, 255, -1, 0, 0, 0 },
- { 172, "700W002", 1, 255, -1, 0, 0, 0 },
- { 208, "700F003", 1, 255, -1, 0, 0, 0 },
- { 268, "700Z003", 1, 255, -1, 0, 0, 0 },
- { 350, "700F004", 1, 255, -1, 0, 0, 0 },
- { 368, "700F005", 1, 255, -1, 0, 0, 0 },
- { 415, "700Z004", 1, 255, -1, 0, 0, 0 },
- { 476, "700F006", 1, 255, -1, 0, 0, 0 },
- { 527, "700F007", 1, 255, -1, 0, 0, 0 },
- { 565, "700W003", 1, 255, -1, 0, 0, 0 },
- { 601, "700F008", 1, 255, -1, 0, 0, 0 },
- { 769, "700Z005", 1, 255, -1, 0, 0, 0 },
- { 796, "700Z006", 1, 255, -1, 0, 0, 0 },
- { 869, "700Z007", 1, 255, -1, 0, 0, 0 },
- { 910, "700F009", 1, 255, -1, 0, 0, 0 },
- { 945, "700Z008", 1, 255, -1, 0, 0, 0 },
- { 989, "700Z009", 1, 255, -1, 0, 0, 0 },
- { 1028, "700C001", 1, 255, -1, 0, 0, 0 },
- { 1073, "700F010", 1, 255, -1, 0, 0, 0 },
- { 1085, "700F011", 1, 255, -1, 0, 0, 0 },
- { 1095, "700F012", 1, 255, -1, 0, 0, 0 },
- { 1105, "700F013", 1, 255, -1, 0, 0, 0 },
- { 1119, "700F014", 1, 255, -1, 0, 0, 0 },
- { 1145, "700F015", 1, 255, -1, 0, 0, 0 },
- { 1175, "700F016", 1, 255, -1, 0, 0, 0 },
- { 1189, "700Z010", 1, 255, -1, 0, 0, 0 },
- { 1227, "700Z011", 1, 255, -1, 0, 0, 0 },
- { 1255, "700C002", 1, 255, -1, 0, 0, 0 },
- { 1296, "700A001", 1, 255, -1, 0, 0, 0 },
- { 1317, "700Z012", 1, 255, -1, 0, 0, 0 },
- { 1318, "700A_003", 2, 255, -1, 0, 0, 0 },
- { 1335, "700A_004", 2, 255, -1, 0, 0, 0 },
+ { 0, "700Z001", 1, 255, -1, 0, nullptr, 0 },
+ { 64, "700A_001", 2, 200, -1, 0, nullptr, 0 },
+ { 66, "700W001", 1, 255, -1, 0, nullptr, 0 },
+ { 68, "700F001", 2, 255, -1, 0, nullptr, 0 },
+ { 92, "700A_002", 2, 255, -1, 0, nullptr, 0 },
+ { 96, "700Z002", 1, 255, -1, 0, nullptr, 0 },
+ { 130, "700F002", 1, 255, -1, 0, nullptr, 0 },
+ { 172, "700W002", 1, 255, -1, 0, nullptr, 0 },
+ { 208, "700F003", 1, 255, -1, 0, nullptr, 0 },
+ { 268, "700Z003", 1, 255, -1, 0, nullptr, 0 },
+ { 350, "700F004", 1, 255, -1, 0, nullptr, 0 },
+ { 368, "700F005", 1, 255, -1, 0, nullptr, 0 },
+ { 415, "700Z004", 1, 255, -1, 0, nullptr, 0 },
+ { 476, "700F006", 1, 255, -1, 0, nullptr, 0 },
+ { 527, "700F007", 1, 255, -1, 0, nullptr, 0 },
+ { 565, "700W003", 1, 255, -1, 0, nullptr, 0 },
+ { 601, "700F008", 1, 255, -1, 0, nullptr, 0 },
+ { 769, "700Z005", 1, 255, -1, 0, nullptr, 0 },
+ { 796, "700Z006", 1, 255, -1, 0, nullptr, 0 },
+ { 869, "700Z007", 1, 255, -1, 0, nullptr, 0 },
+ { 910, "700F009", 1, 255, -1, 0, nullptr, 0 },
+ { 945, "700Z008", 1, 255, -1, 0, nullptr, 0 },
+ { 989, "700Z009", 1, 255, -1, 0, nullptr, 0 },
+ { 1028, "700C001", 1, 255, -1, 0, nullptr, 0 },
+ { 1073, "700F010", 1, 255, -1, 0, nullptr, 0 },
+ { 1085, "700F011", 1, 255, -1, 0, nullptr, 0 },
+ { 1095, "700F012", 1, 255, -1, 0, nullptr, 0 },
+ { 1105, "700F013", 1, 255, -1, 0, nullptr, 0 },
+ { 1119, "700F014", 1, 255, -1, 0, nullptr, 0 },
+ { 1145, "700F015", 1, 255, -1, 0, nullptr, 0 },
+ { 1175, "700F016", 1, 255, -1, 0, nullptr, 0 },
+ { 1189, "700Z010", 1, 255, -1, 0, nullptr, 0 },
+ { 1227, "700Z011", 1, 255, -1, 0, nullptr, 0 },
+ { 1255, "700C002", 1, 255, -1, 0, nullptr, 0 },
+ { 1296, "700A001", 1, 255, -1, 0, nullptr, 0 },
+ { 1317, "700Z012", 1, 255, -1, 0, nullptr, 0 },
+ { 1318, "700A_003", 2, 255, -1, 0, nullptr, 0 },
+ { 1335, "700A_004", 2, 255, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
diff --git a/engines/m4/burger/rooms/section7/room706.cpp b/engines/m4/burger/rooms/section7/room706.cpp
index 1989963ac27..55e0bd8a530 100644
--- a/engines/m4/burger/rooms/section7/room706.cpp
+++ b/engines/m4/burger/rooms/section7/room706.cpp
@@ -558,7 +558,7 @@ void Room706::parser() {
void Room706::conv83() {
if (conv_sound_to_play()) {
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (who <= 0) {
_astralShould = 1;
diff --git a/engines/m4/burger/rooms/section7/section7.cpp b/engines/m4/burger/rooms/section7/section7.cpp
index 142e03afb21..93c43ff8c6a 100644
--- a/engines/m4/burger/rooms/section7/section7.cpp
+++ b/engines/m4/burger/rooms/section7/section7.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/burger/rooms/section7/section7.h"
-#include "m4/burger/vars.h"
namespace M4 {
namespace Burger {
Commit: 523cecf636b281a0d4597edcb669fcb922a28e94
https://github.com/scummvm/scummvm/commit/523cecf636b281a0d4597edcb669fcb922a28e94
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-27T10:43:47+01:00
Commit Message:
M4: BURGER: Review and cleanup of section 8
Changed paths:
engines/m4/burger/rooms/section8/room801.cpp
engines/m4/burger/rooms/section8/room802.cpp
engines/m4/burger/rooms/section8/section8.cpp
diff --git a/engines/m4/burger/rooms/section8/room801.cpp b/engines/m4/burger/rooms/section8/room801.cpp
index bf412e47cb1..db9fda972b3 100644
--- a/engines/m4/burger/rooms/section8/room801.cpp
+++ b/engines/m4/burger/rooms/section8/room801.cpp
@@ -307,9 +307,9 @@ void Room801::daemon() {
case 14:
// Conversation handler
if (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 (who <= 0) {
if ((node == 3 && entry == 0) || (node == 4 && entry == 0) ||
@@ -515,7 +515,7 @@ void Room801::daemon() {
case 36:
_G(flags)[kFirstTestPassed] = 1;
- adv_kill_digi_between_rooms(1);
+ adv_kill_digi_between_rooms(true);
kernel_trigger_dispatch_now(k10027);
break;
diff --git a/engines/m4/burger/rooms/section8/room802.cpp b/engines/m4/burger/rooms/section8/room802.cpp
index 94099fbb091..d342cf2683d 100644
--- a/engines/m4/burger/rooms/section8/room802.cpp
+++ b/engines/m4/burger/rooms/section8/room802.cpp
@@ -110,9 +110,9 @@ static const seriesPlayBreak PLAY4[] = {
};
static const seriesPlayBreak PLAY5[] = {
- { 0, 7, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 7, 7, 0, 0, 0, -1, 0, 0, 0, 0 },
- { 7, 0, 0, 0, 0, -1, 0, 0, 0, 0 },
+ { 0, 7, 0, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 7, 7, 0, 0, 0, -1, 0, 0, nullptr, 0 },
+ { 7, 0, 0, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
@@ -396,7 +396,7 @@ void Room802::daemon() {
case 19:
if (conv_sound_to_play()) {
- int who = conv_whos_talking();
+ const int who = conv_whos_talking();
if (who <= 0)
_G(flumix_should) = 5;
else if (who == 1)
@@ -534,7 +534,9 @@ void Room802::daemon() {
break;
}
break;
-
+
+ default:
+ break;
}
break;
diff --git a/engines/m4/burger/rooms/section8/section8.cpp b/engines/m4/burger/rooms/section8/section8.cpp
index a580390e26b..8bdd298f2cb 100644
--- a/engines/m4/burger/rooms/section8/section8.cpp
+++ b/engines/m4/burger/rooms/section8/section8.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/burger/rooms/section8/section8.h"
-#include "m4/burger/vars.h"
namespace M4 {
namespace Burger {
Commit: ef0a76c5a3faa36313f97da30dc28a8a220e2ef3
https://github.com/scummvm/scummvm/commit/ef0a76c5a3faa36313f97da30dc28a8a220e2ef3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-27T11:08:22+01:00
Commit Message:
M4: BURGER: Review and cleanup of section 9
Changed paths:
engines/m4/burger/rooms/section9/room904.cpp
engines/m4/burger/rooms/section9/room951.cpp
engines/m4/burger/rooms/section9/room971.cpp
diff --git a/engines/m4/burger/rooms/section9/room904.cpp b/engines/m4/burger/rooms/section9/room904.cpp
index 67524f96c20..3ce2e5a437d 100644
--- a/engines/m4/burger/rooms/section9/room904.cpp
+++ b/engines/m4/burger/rooms/section9/room904.cpp
@@ -570,7 +570,7 @@ const char *Room904::getCreditsSectionString(int sectionNum) const {
}
int Room904::getCreditsSectionLines(int sectionNum) const {
- int sectionStart = getCreditsSectionLine(sectionNum);
+ const int sectionStart = getCreditsSectionLine(sectionNum);
int lineNum = sectionStart;
while (CREDITS[lineNum])
@@ -614,8 +614,8 @@ void Room904::creditsCallback(TextItem *textItem, TextScrn *textScrn) {
void Room904::updateCredits(TextItem *textItem, TextScrn *textScrn) {
const char *credit = textItem->prompt;
- int sectionNum = textItem->tag;
- int linesCount = getCreditsSectionLines(sectionNum);
+ const int sectionNum = textItem->tag;
+ const int linesCount = getCreditsSectionLines(sectionNum);
term_message("credit: %s index: %d names: %d", credit, sectionNum, linesCount);
playRandomSound(-1, 2);
@@ -625,13 +625,13 @@ void Room904::updateCredits(TextItem *textItem, TextScrn *textScrn) {
gr_font_set(_G(font_conv));
_fontHeight = gr_font_get_height();
- int sectionWidth = getCreditsSectionWidth(sectionNum) + 20;
- int sectionHeight = linesCount * _fontHeight + 20;
+ const int sectionWidth = getCreditsSectionWidth(sectionNum) + 20;
+ const int sectionHeight = linesCount * _fontHeight + 20;
- int x1 = (640 - _x2 - sectionWidth) / 2 + _x2;
- int y1 = (480 - sectionHeight) / 2;
- int x2 = x1 + sectionWidth;
- int y2 = y1 + sectionHeight;
+ const int x1 = (640 - _x2 - sectionWidth) / 2 + _x2;
+ const int y1 = (480 - sectionHeight) / 2;
+ const int x2 = x1 + sectionWidth;
+ const int y2 = y1 + sectionHeight;
if (_screen2)
TextScrn_Destroy(_screen2);
@@ -652,8 +652,7 @@ void Room904::updateCredits(TextItem *textItem, TextScrn *textScrn) {
}
void Room904::playRandomSound(int trigger, int channel) {
- Common::String name = Common::String::format("904pop%d",
- g_engine->getRandomNumber(4) + 1);
+ const Common::String name = Common::String::format("904pop%d", g_engine->getRandomNumber(4) + 1);
digi_play(name.c_str(), channel, 255, trigger);
}
diff --git a/engines/m4/burger/rooms/section9/room951.cpp b/engines/m4/burger/rooms/section9/room951.cpp
index d07ee64ab89..796eaef9709 100644
--- a/engines/m4/burger/rooms/section9/room951.cpp
+++ b/engines/m4/burger/rooms/section9/room951.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/burger/rooms/section9/room951.h"
-#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_trigger.h"
#include "m4/burger/vars.h"
#include "m4/m4.h"
@@ -105,21 +104,21 @@ static const seriesStreamBreak planet_x_hilltop_a[] = {
};
static const seriesStreamBreak planet_x_low_shot[] = {
- { 0, nullptr, 2, 0, -1, 2048, 0, 0 },
- { 0, "952_003", 1, 200, -1, 0, 0, 0 },
- { 21, "952_001", 3, 120, -1, 0, 0, 0 },
- { 73, "952_002", 2, 160, -1, 0, 0, 0 },
- { 80, "952Z001", 1, 255, -1, 0, 0, 0 },
- { 92, "952_005", 2, 160, -1, 0, 0, 0 },
- { 111, "952_006", 2, 100, -1, 0, 0, 0 },
- { 117, "952_007", 2, 100, -1, 0, 0, 0 },
- { 124, "952_004", 1, 225, -1, 0, 0, 0 },
- { 136, "952_004", 1, 245, -1, 0, 0, 0 },
- { 143, "952_010", 1, 255, -1, 0, 0, 0 },
- { 147, "952_004", 1, 235, -1, 0, 0, 0 },
- { 153, "952_008", 2, 100, -1, 0, 0, 0 },
- { 154, "952_009", 3, 200, -1, 0, 0, 0 },
- { 157, 0, 0, 0, 52, 0, 0, 0 },
+ { 0, nullptr, 2, 0, -1, 2048, nullptr, 0 },
+ { 0, "952_003", 1, 200, -1, 0, nullptr, 0 },
+ { 21, "952_001", 3, 120, -1, 0, nullptr, 0 },
+ { 73, "952_002", 2, 160, -1, 0, nullptr, 0 },
+ { 80, "952Z001", 1, 255, -1, 0, nullptr, 0 },
+ { 92, "952_005", 2, 160, -1, 0, nullptr, 0 },
+ { 111, "952_006", 2, 100, -1, 0, nullptr, 0 },
+ { 117, "952_007", 2, 100, -1, 0, nullptr, 0 },
+ { 124, "952_004", 1, 225, -1, 0, nullptr, 0 },
+ { 136, "952_004", 1, 245, -1, 0, nullptr, 0 },
+ { 143, "952_010", 1, 255, -1, 0, nullptr, 0 },
+ { 147, "952_004", 1, 235, -1, 0, nullptr, 0 },
+ { 153, "952_008", 2, 100, -1, 0, nullptr, 0 },
+ { 154, "952_009", 3, 200, -1, 0, nullptr, 0 },
+ { 157, nullptr, 0, 0, 52, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -275,45 +274,45 @@ static const seriesStreamBreak break_961a[] = {
};
static const seriesStreamBreak break_961b[] = {
- { 0, nullptr, 0, 0, -1, 0, 0, 0 },
- { 4, "961_003", 1, 255, -1, 0, 0, 0 },
- { 19, "961_004", 2, 180, -1, 0, 0, 0 },
- { 38, "961_005", 1, 255, -1, 0, 0, 0 },
- { 55, nullptr, 0, 0, 52, 0, 0, 0 },
+ { 0, nullptr, 0, 0, -1, 0, nullptr, 0 },
+ { 4, "961_003", 1, 255, -1, 0, nullptr, 0 },
+ { 19, "961_004", 2, 180, -1, 0, nullptr, 0 },
+ { 38, "961_005", 1, 255, -1, 0, nullptr, 0 },
+ { 55, nullptr, 0, 0, 52, 0, nullptr, 0 },
STREAM_BREAK_END
};
static const seriesStreamBreak break_961c[] = {
- { 0, nullptr, 0, 0, -1, 0, 0, 0 },
- { 1, "961_006", 2, 130, -1, 0, 0, 0 },
- { 29, "961_007", 1, 255, -1, 0, 0, 0 },
- { 62, "961_008", 1, 255, -1, 0, 0, 0 },
- { 75, "961_009", 1, 200, -1, 0, 0, 0 },
- { 95, "961_007", 2, 255, -1, 0, 0, 0 },
- { 100, nullptr, 3, 240, -1, 0, 0, 0 },
- { 101, nullptr, 3, 220, -1, 0, 0, 0 },
- { 102, nullptr, 3, 200, -1, 0, 0, 0 },
- { 103, nullptr, 3, 180, -1, 0, 0, 0 },
- { 104, nullptr, 3, 160, -1, 0, 0, 0 },
- { 105, nullptr, 3, 140, -1, 0, 0, 0 },
- { 106, nullptr, 3, 120, -1, 0, 0, 0 },
- { 107, nullptr, 3, 100, -1, 0, 0, 0 },
- { 108, nullptr, 3, 90, -1, 0, 0, 0 },
- { 109, nullptr, 3, 80, -1, 0, 0, 0 },
- { 110, nullptr, 3, 60, -1, 0, 0, 0 },
- { 112, nullptr, 3, 40, -1, 0, 0, 0 },
- { 114, nullptr, 3, 20, -1, 0, 0, 0 },
- { 116, nullptr, 3, 10, -1, 0, 0, 0 },
- { 117, nullptr, 0, 0, 52, 0, 0, 0 },
- { 118, nullptr, 3, 0, -1, 0, 0, 0 },
+ { 0, nullptr, 0, 0, -1, 0, nullptr, 0 },
+ { 1, "961_006", 2, 130, -1, 0, nullptr, 0 },
+ { 29, "961_007", 1, 255, -1, 0, nullptr, 0 },
+ { 62, "961_008", 1, 255, -1, 0, nullptr, 0 },
+ { 75, "961_009", 1, 200, -1, 0, nullptr, 0 },
+ { 95, "961_007", 2, 255, -1, 0, nullptr, 0 },
+ { 100, nullptr, 3, 240, -1, 0, nullptr, 0 },
+ { 101, nullptr, 3, 220, -1, 0, nullptr, 0 },
+ { 102, nullptr, 3, 200, -1, 0, nullptr, 0 },
+ { 103, nullptr, 3, 180, -1, 0, nullptr, 0 },
+ { 104, nullptr, 3, 160, -1, 0, nullptr, 0 },
+ { 105, nullptr, 3, 140, -1, 0, nullptr, 0 },
+ { 106, nullptr, 3, 120, -1, 0, nullptr, 0 },
+ { 107, nullptr, 3, 100, -1, 0, nullptr, 0 },
+ { 108, nullptr, 3, 90, -1, 0, nullptr, 0 },
+ { 109, nullptr, 3, 80, -1, 0, nullptr, 0 },
+ { 110, nullptr, 3, 60, -1, 0, nullptr, 0 },
+ { 112, nullptr, 3, 40, -1, 0, nullptr, 0 },
+ { 114, nullptr, 3, 20, -1, 0, nullptr, 0 },
+ { 116, nullptr, 3, 10, -1, 0, nullptr, 0 },
+ { 117, nullptr, 0, 0, 52, 0, nullptr, 0 },
+ { 118, nullptr, 3, 0, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
static const seriesStreamBreak break_961d[] = {
- { -1, nullptr, 0, 0, -1, 0, 0, 0 },
- { 0, nullptr, 0, 0, -1, 0, 0, 0 },
- { 39, nullptr, 0, 0, 52, 0, 0, 0 },
- { 42, nullptr, 0, 0,2048, 0, 0, 0 },
+ { -1, nullptr, 0, 0, -1, 0, nullptr, 0 },
+ { 0, nullptr, 0, 0, -1, 0, nullptr, 0 },
+ { 39, nullptr, 0, 0, 52, 0, nullptr, 0 },
+ { 42, nullptr, 0, 0,2048, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -526,7 +525,7 @@ void Room951::daemon() {
case START_33:
palette_prep_for_stream();
- kernel_timing_trigger(TENTH_SECOND, START_34, 0);
+ kernel_timing_trigger(TENTH_SECOND, START_34, nullptr);
break;
case START_34:
@@ -548,12 +547,12 @@ void Room951::daemon() {
case START_36:
pal_fade_set_start(_G(master_palette), 0);
pal_cycle_stop();
- kernel_timing_trigger(TENTH_SECOND, START_37, 0);
+ kernel_timing_trigger(TENTH_SECOND, START_37, nullptr);
break;
case START_37:
compact_mem_and_report();
- kernel_timing_trigger(1, START_38, 0);
+ kernel_timing_trigger(1, START_38, nullptr);
break;
case START_38:
@@ -566,7 +565,7 @@ void Room951::daemon() {
case START_39:
pal_fade_set_start(_G(master_palette), 0);
- kernel_timing_trigger(TENTH_SECOND, START_40, 0);
+ kernel_timing_trigger(TENTH_SECOND, START_40, nullptr);
break;
case START_40:
@@ -584,7 +583,7 @@ void Room951::daemon() {
case START_42:
pal_fade_set_start(_G(master_palette), 0);
- kernel_timing_trigger(TENTH_SECOND, START_43, 0);
+ kernel_timing_trigger(TENTH_SECOND, START_43, nullptr);
break;
case START_43:
diff --git a/engines/m4/burger/rooms/section9/room971.cpp b/engines/m4/burger/rooms/section9/room971.cpp
index 0d75f575eb6..b1f1d17d2c5 100644
--- a/engines/m4/burger/rooms/section9/room971.cpp
+++ b/engines/m4/burger/rooms/section9/room971.cpp
@@ -45,12 +45,12 @@ const seriesStreamBreak Room971::SERIES2[] = {
};
const seriesStreamBreak Room971::SERIES3[] = {
- { 0, "972birds", 3, 80, -1, 1024, 0, 0 },
- { 1, "972d001", 1, 255, -1, 0, 0, 0 },
- { 35, "971slam", 2, 80, -1, 0, 0, 0 },
- { 53, "972run_1", 2, 100, -1, 0, 0, 0 },
- { 110, "972dream", 2, 150, -1, 0, 0, 0 },
- { 129, nullptr, 0, 0, 56, 0, 0, 0 },
+ { 0, "972birds", 3, 80, -1, 1024, nullptr, 0 },
+ { 1, "972d001", 1, 255, -1, 0, nullptr, 0 },
+ { 35, "971slam", 2, 80, -1, 0, nullptr, 0 },
+ { 53, "972run_1", 2, 100, -1, 0, nullptr, 0 },
+ { 110, "972dream", 2, 150, -1, 0, nullptr, 0 },
+ { 129, nullptr, 0, 0, 56, 0, nullptr, 0 },
STREAM_BREAK_END
};
@@ -132,8 +132,8 @@ const seriesStreamBreak Room971::SERIES12[] = {
};
const seriesStreamBreak Room971::SERIES13[] = {
- { 0, "984ambi", 3, 60, -1, 1024, 0, 0 },
- { 10, "984d001", 1, 255, -1, 0, 0, 0 },
+ { 0, "984ambi", 3, 60, -1, 1024, nullptr, 0 },
+ { 10, "984d001", 1, 255, -1, 0, nullptr, 0 },
STREAM_BREAK_END
};
More information about the Scummvm-git-logs
mailing list