[Scummvm-git-logs] scummvm master -> b9e6130f281400165be4d8a72dc20fc84f1b0db8
Strangerke
noreply at scummvm.org
Mon Feb 2 08:07:11 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:
c13795ce0a M4: BURGER: Fix PVS Studio V703 in interface, remove an unused include
6990a25d5b M4: BURGER: Fix 3 PVS Studio V1074 in inventory, some cleanup in m4.cpp
b9e6130f28 M4: BURGER: Fix 5 PVS Studio V1037 in room logic after a check in IDA
Commit: c13795ce0a7ad0a24642e0cb36e13a9707d1de2f
https://github.com/scummvm/scummvm/commit/c13795ce0a7ad0a24642e0cb36e13a9707d1de2f
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-02T08:06:02+01:00
Commit Message:
M4: BURGER: Fix PVS Studio V703 in interface, remove an unused include
Changed paths:
engines/m4/burger/gui/interface.h
diff --git a/engines/m4/burger/gui/interface.h b/engines/m4/burger/gui/interface.h
index 3b3d86012ff..ff4d8f97176 100644
--- a/engines/m4/burger/gui/interface.h
+++ b/engines/m4/burger/gui/interface.h
@@ -26,7 +26,6 @@
#include "m4/adv_r/adv_interface.h"
#include "m4/adv_r/adv_hotspot.h"
#include "m4/graphics/graphics.h"
-#include "m4/graphics/gr_buff.h"
#include "m4/burger/gui/inventory.h"
namespace M4 {
@@ -44,7 +43,6 @@ private:
public:
int _sprite = 22; // main_interface_sprite;
- bool _shown = false;
GUI::InterfaceBox *_interfaceBox = nullptr;
GUI::Inventory *_inventory = nullptr;
GUI::TextField *_textField = nullptr;
Commit: 6990a25d5be2c54dbce9069240e692e480d80b8f
https://github.com/scummvm/scummvm/commit/6990a25d5be2c54dbce9069240e692e480d80b8f
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-02T08:11:17+01:00
Commit Message:
M4: BURGER: Fix 3 PVS Studio V1074 in inventory, some cleanup in m4.cpp
Changed paths:
engines/m4/burger/inventory.cpp
engines/m4/burger/inventory.h
engines/m4/m4.cpp
diff --git a/engines/m4/burger/inventory.cpp b/engines/m4/burger/inventory.cpp
index 0696f63b2ef..c1e82bb9dc6 100644
--- a/engines/m4/burger/inventory.cpp
+++ b/engines/m4/burger/inventory.cpp
@@ -42,7 +42,7 @@ static const InvObject INVENTORY_ITEMS[] = {
{ "whistle", "PFEIFE", "SIFFLET", 170, 40, 40},
{ "carrot juice", "M\xd6""HRENSAFT", "JUS DE CAROTTES", 172, 25, 25},
{ "deed", "URKUNDE", "ACTE DE VENTE", 105, 38, 38},
- { "laxative", "ABF\xdcHRMITTEL", "LAXATIF", 174, 54, 54},
+ { "laxative", "ABF\xdc""HRMITTEL", "LAXATIF", 174, 54, 54},
{ "amplifier", "VERST\xc4""RKER", "AMPLIFICATEUR", 145, 34, 34},
{ "jawz o' life", "KLEMMBACKE", "LA TRON\xc7ONNEUSE", 137, 37, 37},
{ "broken puz dispenser", "Bonbonspender,kaputt", "BOITE A PEZ CASSEE", 176, 16, 16},
@@ -59,8 +59,8 @@ static const InvObject INVENTORY_ITEMS[] = {
{ "gizmo", "GER\xc4""T", "GIZMO", 999, 58, 58},
{ "kindling", "ANZ\xdc""NDHOLZ", "PETIT BOIS", 999, 20, 20},
{ "burning kindling", "BRENNENDES HOLZ", "PETIT BOIS ENFLAMME", 999, 21, 21},
- { "christmas lights", "LICHTERKETTE", "LUMIERES DE NO\xebL", 508, 22, 22},
- { "christmas lights ", "LICHTERKETTE", "LUMIERES DE NO\xebL", 508, 23, 23 },
+ { "christmas lights", "LICHTERKETTE", "LUMIERES DE NO\xeb""L", 508, 22, 22},
+ { "christmas lights ", "LICHTERKETTE", "LUMIERES DE NO\xeb""L", 508, 23, 23 },
{ "bottle", "FLASCHE", "BOUTEILLE", 999, 24, 24},
{ "soapy water", "SEIFENWASSER", "EAU DE BAIN", 999, 26, 26},
{ "rubber gloves", "GUMMIHANDSCHUHE", "GANTS DE CAOUTCHOUC", 503, 35, 35},
diff --git a/engines/m4/burger/inventory.h b/engines/m4/burger/inventory.h
index 85b7a185455..87167dd7e87 100644
--- a/engines/m4/burger/inventory.h
+++ b/engines/m4/burger/inventory.h
@@ -24,7 +24,6 @@
#define M4_BURGER_INVENTORY_H
#include "common/array.h"
-#include "m4/m4_types.h"
#include "m4/adv_r/adv_inv.h"
namespace M4 {
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 7ee734685f1..6c32690e2df 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -33,7 +33,6 @@
#include "m4/adv_r/conv_io.h"
#include "m4/graphics/gr_sprite.h"
#include "m4/gui/hotkeys.h"
-#include "m4/platform/sound/digi.h"
#include "m4/platform/sound/midi.h"
#include "m4/detection.h"
#include "m4/console.h"
@@ -120,7 +119,7 @@ void M4Engine::m4_inflight() {
while (KEEP_PLAYING) {
if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
midi_stop();
- int slot = _G(kernel).restore_slot;
+ const int slot = _G(kernel).restore_slot;
if (!kernel_load_game(slot))
error("Could not restore save slot %d", slot);
}
@@ -384,7 +383,7 @@ bool M4Engine::saveGameFromMenu(int slotNum, const Common::String &desc,
M4MetaEngine *metaEngine = static_cast<M4MetaEngine *>(getMetaEngine());
metaEngine->_thumbnail = &thumbnail;
- bool result = saveGameState(slotNum, desc).getCode() == Common::kNoError;
+ const bool result = saveGameState(slotNum, desc).getCode() == Common::kNoError;
metaEngine->_thumbnail = nullptr;
return result;
Commit: b9e6130f281400165be4d8a72dc20fc84f1b0db8
https://github.com/scummvm/scummvm/commit/b9e6130f281400165be4d8a72dc20fc84f1b0db8
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-02T09:04:40+01:00
Commit Message:
M4: BURGER: Fix 5 PVS Studio V1037 in room logic after a check in IDA
Changed paths:
engines/m4/burger/rooms/section1/room102.cpp
engines/m4/burger/rooms/section1/room105.cpp
engines/m4/burger/rooms/section1/room137.cpp
diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index 3ebc7fc024c..fa17a6fee64 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -1023,6 +1023,7 @@ void Room102::daemon() {
break;
case 72:
+ case 76:
digi_unload_stream_breaks(STREAMS6);
ws_unhide_walker();
wilbur_speech("102w011", 28);
@@ -1037,6 +1038,7 @@ void Room102::daemon() {
break;
case 74:
+ case 78:
digi_unload_stream_breaks(STREAMS7);
ws_unhide_walker();
wilbur_speech("102w011", 28);
@@ -1050,12 +1052,6 @@ void Room102::daemon() {
series_stream_with_breaks(STREAMS6, "102wi11", 6, 0x100, kCHANGE_WILBUR_ANIMATION);
break;
- case 76:
- digi_unload_stream_breaks(STREAMS6);
- ws_unhide_walker();
- wilbur_speech("102w011", 28);
- break;
-
case 77:
ws_hide_walker();
_G(wilbur_should) = 78;
@@ -1064,12 +1060,6 @@ void Room102::daemon() {
series_stream_with_breaks(STREAMS7, "102wi10", 6, 0x100, kCHANGE_WILBUR_ANIMATION);
break;
- case 78:
- digi_unload_stream_breaks(STREAMS7);
- ws_unhide_walker();
- wilbur_speech("102w011", 28);
- break;
-
case 79:
ws_hide_walker();
terminateMachineAndNull(_laz1);
diff --git a/engines/m4/burger/rooms/section1/room105.cpp b/engines/m4/burger/rooms/section1/room105.cpp
index 9e5736be3c7..9503ca9bf7a 100644
--- a/engines/m4/burger/rooms/section1/room105.cpp
+++ b/engines/m4/burger/rooms/section1/room105.cpp
@@ -1046,6 +1046,7 @@ void Room105::daemon() {
case 5:
case 6:
+ case 26:
player_set_commands_allowed(true);
break;
@@ -1159,13 +1160,10 @@ void Room105::daemon() {
break;
case 25:
+ case 46:
ws_unhide_walker();
break;
- case 26:
- player_set_commands_allowed(true);
- break;
-
case 27:
ws_demand_location(358, 246, 11);
ws_hide_walker();
@@ -1284,10 +1282,6 @@ void Room105::daemon() {
terminateMachineAndNull(_series5);
break;
- case 46:
- ws_unhide_walker();
- break;
-
case kCHANGE_WILBUR_ANIMATION:
switch (_G(wilbur_should)) {
case 62:
diff --git a/engines/m4/burger/rooms/section1/room137.cpp b/engines/m4/burger/rooms/section1/room137.cpp
index 7a8ee0bac74..7631397acba 100644
--- a/engines/m4/burger/rooms/section1/room137.cpp
+++ b/engines/m4/burger/rooms/section1/room137.cpp
@@ -616,6 +616,7 @@ void Room137::daemon() {
break;
case 2:
+ case 9:
ws_unhide_walker();
player_set_commands_allowed(true);
break;
@@ -670,11 +671,6 @@ void Room137::daemon() {
hotspot_set_active("jawz o' life", false);
break;
- case 9:
- ws_unhide_walker();
- player_set_commands_allowed(true);
- break;
-
case 35:
_G(wilbur_should) = 36;
ws_hide_walker();
More information about the Scummvm-git-logs
mailing list