[Scummvm-git-logs] scummvm master -> f86b3948d7fa4fcc7e3091ba7ba30fe342b5df84
Strangerke
noreply at scummvm.org
Mon Feb 16 18:56:29 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:
ad3041fecb M4: BURGER: Initialize arrays in room 105
10e87ad5db M4: BURGER: Remove dead code in rooms 142 and 172
de3211e219 M4: BURGER: Rename a variable in room 138
f86b3948d7 M4: RIDDLE: Better initialization of arrays in room 201
Commit: ad3041fecb0c177ad13a04f0a99b3e1f644d8a1b
https://github.com/scummvm/scummvm/commit/ad3041fecb0c177ad13a04f0a99b3e1f644d8a1b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-16T19:56:07+01:00
Commit Message:
M4: BURGER: Initialize arrays in room 105
Changed paths:
engines/m4/burger/rooms/section1/room105.h
diff --git a/engines/m4/burger/rooms/section1/room105.h b/engines/m4/burger/rooms/section1/room105.h
index fd20d1c688b..4db3b34a3db 100644
--- a/engines/m4/burger/rooms/section1/room105.h
+++ b/engines/m4/burger/rooms/section1/room105.h
@@ -35,7 +35,6 @@ private:
int _elgusMode = 0;
KernelTriggerType _savedMode = (KernelTriggerType)0;
int _savedTrigger = 0;
- //int _val7 = 0;
int _val8 = 0;
bool _flag1 = false;
bool _flag2 = false;
@@ -43,10 +42,10 @@ private:
bool _flag4 = false;
bool _flag5 = false;
const char *_digi1 = nullptr;
- int _series1[12];
- int _series2[4];
- int _series3[12];
- int _series4[5];
+ int _series1[12] = { 0 };
+ int _series2[4] = { 0 };
+ int _series3[12] = { 0 };
+ int _series4[5] = { 0 };
machine *_series5 = nullptr;
machine *_series6 = nullptr;
machine *_series7 = nullptr;
Commit: 10e87ad5dbbb60202e33559d44e988dd9f407997
https://github.com/scummvm/scummvm/commit/10e87ad5dbbb60202e33559d44e988dd9f407997
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-16T19:56:08+01:00
Commit Message:
M4: BURGER: Remove dead code in rooms 142 and 172
Changed paths:
engines/m4/burger/rooms/section1/room142.h
engines/m4/burger/rooms/section1/room172.h
diff --git a/engines/m4/burger/rooms/section1/room142.h b/engines/m4/burger/rooms/section1/room142.h
index deadaeb1bc3..ddf3e0b28dd 100644
--- a/engines/m4/burger/rooms/section1/room142.h
+++ b/engines/m4/burger/rooms/section1/room142.h
@@ -61,7 +61,6 @@ private:
static int32 _val1;
static int32 _val2;
static int32 _val3;
- //int _val4 = 0;
void checkAction();
void faceTruck();
diff --git a/engines/m4/burger/rooms/section1/room172.h b/engines/m4/burger/rooms/section1/room172.h
index cb450692f20..41723590c33 100644
--- a/engines/m4/burger/rooms/section1/room172.h
+++ b/engines/m4/burger/rooms/section1/room172.h
@@ -33,7 +33,6 @@ private:
machine *_series1 = nullptr;
machine *_series1s = nullptr;
Series _jug;
- //machine *_series4 = nullptr;
Series _series5;
machine *_series7 = nullptr;
noWalkRect *_walk1 = nullptr;
Commit: de3211e219b5fb17256461232a1af67f9c710815
https://github.com/scummvm/scummvm/commit/de3211e219b5fb17256461232a1af67f9c710815
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-16T19:56:09+01:00
Commit Message:
M4: BURGER: Rename a variable in room 138
Changed paths:
engines/m4/burger/rooms/section1/room138.cpp
engines/m4/burger/rooms/section1/room138.h
diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index f3f4fc8ec1c..4dc3dcbc623 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -134,7 +134,7 @@ void Room138::init() {
_deputyMode = 18;
_deputyShould = 18;
kernel_trigger_dispatch_now(1);
- _val4 = -1;
+ _val4_frameNumber = -1;
_sherrifMode = 26;
_sherrifShould = 26;
kernel_trigger_dispatch_now(kCHANGE_SHERRIF_ANIMATION);
@@ -225,37 +225,37 @@ void Room138::daemon() {
case 26:
case 33:
case 36:
- if (_sherrifShould == 33 && _val4 == 22) {
+ if (_sherrifShould == 33 && _val4_frameNumber == 22) {
freeAssets();
term_message("xxx");
_sherrifShould = 34;
series_play("138cp06", 0x100, 0, kCHANGE_SHERRIF_ANIMATION, 8, 0, 100, 0, 0, 0, 18);
digi_play("138_005", 2);
- } else if (_sherrifShould == 36 && _val4 == 22) {
+ } else if (_sherrifShould == 36 && _val4_frameNumber == 22) {
_sherrifShould = 26;
series_play("138cp02", 0x100, 0, kCHANGE_SHERRIF_ANIMATION, 8, 0, 100, 0, 0, 0, 30);
randomDigi();
- } else if (_val4 == 22 && !inv_object_is_here("keys") &&
+ } else if (_val4_frameNumber == 22 && !inv_object_is_here("keys") &&
imath_ranged_rand(1, 2) == 1) {
term_message(".........................");
_sherrifShould = 37;
series_play("138cp02", 0x100, 2, kCHANGE_SHERRIF_ANIMATION, 8, 0, 100, 0, 0, 25, 30);
- } else if (_val4 == 22 && imath_ranged_rand(1, 6) != 1) {
+ } else if (_val4_frameNumber == 22 && imath_ranged_rand(1, 6) != 1) {
series_play("138cp01", 0x100, 0, kCHANGE_SHERRIF_ANIMATION, 60, 0, 100, 0, 0, 0, 0);
} else {
_flag1 = false;
- switch (++_val4) {
+ switch (++_val4_frameNumber) {
case 13:
digi_play("137_022", 2);
break;
case 23:
- _val4 = 0;
+ _val4_frameNumber = 0;
digi_play(imath_ranged_rand(1, 2) == 1 ? "137_020" : "137_021", 2);
break;
@@ -263,7 +263,7 @@ void Room138::daemon() {
break;
}
- series_play("138cp01", 0x100, 0, kCHANGE_SHERRIF_ANIMATION, 7, 0, 100, 0, 0, _val4, _val4);
+ series_play("138cp01", 0x100, 0, kCHANGE_SHERRIF_ANIMATION, 7, 0, 100, 0, 0, _val4_frameNumber, _val4_frameNumber);
}
break;
diff --git a/engines/m4/burger/rooms/section1/room138.h b/engines/m4/burger/rooms/section1/room138.h
index 7a6f264b9a9..a8b94d130f5 100644
--- a/engines/m4/burger/rooms/section1/room138.h
+++ b/engines/m4/burger/rooms/section1/room138.h
@@ -36,7 +36,7 @@ private:
int _frame = 0;
int _deputyMode = 0;
int _deputyShould = 0;
- int _val4 = 0;
+ int _val4_frameNumber = 0;
int _sherrifMode = 0;
int _sherrifShould = 0;
int _wilburMode = 0;
Commit: f86b3948d7fa4fcc7e3091ba7ba30fe342b5df84
https://github.com/scummvm/scummvm/commit/f86b3948d7fa4fcc7e3091ba7ba30fe342b5df84
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-16T19:56:10+01:00
Commit Message:
M4: RIDDLE: Better initialization of arrays in room 201
Changed paths:
engines/m4/riddle/rooms/section2/room201.cpp
engines/m4/riddle/rooms/section2/room201.h
diff --git a/engines/m4/riddle/rooms/section2/room201.cpp b/engines/m4/riddle/rooms/section2/room201.cpp
index b73d23aaaed..fe0df5aa925 100644
--- a/engines/m4/riddle/rooms/section2/room201.cpp
+++ b/engines/m4/riddle/rooms/section2/room201.cpp
@@ -61,11 +61,6 @@ static const char *USE[][2] = {
{ nullptr, nullptr }
};
-Room201::Room201() : Section2Room() {
- Common::fill(_items, _items + 12, 0);
- Common::fill(_itemFlags, _itemFlags + 12, 0);
-}
-
void Room201::preload() {
Section2Room::preload();
_G(player).walker_in_this_scene = !keyCheck();
diff --git a/engines/m4/riddle/rooms/section2/room201.h b/engines/m4/riddle/rooms/section2/room201.h
index d8dc57ff66a..11b6f8fda73 100644
--- a/engines/m4/riddle/rooms/section2/room201.h
+++ b/engines/m4/riddle/rooms/section2/room201.h
@@ -91,8 +91,8 @@ private:
int _trigger10 = -1;
int _trigger11 = -1;
int _trigger12 = -1;
- int _items[12];
- int32 _itemFlags[12];
+ int _items[12] = { 0 };
+ int32 _itemFlags[12] = { 0 };
int _totalItems = 0;
int32 _hasKeyItems = 0;
@@ -106,7 +106,7 @@ private:
bool buildKeyItemsArray();
public:
- Room201();
+ Room201() : Section2Room() {}
~Room201() override {}
void preload() override;
More information about the Scummvm-git-logs
mailing list