[Scummvm-git-logs] scummvm master -> 0c73119fa9f770870f6f9b163c877202674729d0
Strangerke
noreply at scummvm.org
Sun Feb 8 11:03:58 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:
0c73119fa9 M4: Refactoring - Make benefits of the usages of error_show to remove some useless boolean returns from functions
Commit: 0c73119fa9f770870f6f9b163c877202674729d0
https://github.com/scummvm/scummvm/commit/0c73119fa9f770870f6f9b163c877202674729d0
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-08T12:03:44+01:00
Commit Message:
M4: Refactoring - Make benefits of the usages of error_show to remove some useless boolean returns from functions
Changed paths:
engines/m4/adv_r/adv_inv.cpp
engines/m4/adv_r/adv_inv.h
engines/m4/adv_r/adv_rails.cpp
engines/m4/adv_r/adv_rails.h
engines/m4/adv_r/adv_walk.cpp
engines/m4/gui/gui_vmng_core.cpp
engines/m4/mem/mem.cpp
engines/m4/mem/mem.h
diff --git a/engines/m4/adv_r/adv_inv.cpp b/engines/m4/adv_r/adv_inv.cpp
index bfed048fda1..f5a6fcbd9fd 100644
--- a/engines/m4/adv_r/adv_inv.cpp
+++ b/engines/m4/adv_r/adv_inv.cpp
@@ -68,16 +68,14 @@ void InventoryBase::syncGame(Common::Serializer &s) {
s.syncBytes((byte *)invName, MAX_NAME_LENGTH);
s.syncAsUint32LE(scene);
}
-
}
}
-bool inv_init(int32 num_objects) {
+void inv_init(int32 num_objects) {
term_message("Fluffing up the backpack", nullptr);
_G(inventory)->_objects.resize(num_objects);
- if (!mem_register_stash_type(&_G(inv_obj_mem_type), sizeof(InvObj), num_objects, "obj"))
- error_show(FL, "fail to mem_register_stash_type for inv_obj");
+ mem_register_stash_type(&_G(inv_obj_mem_type), sizeof(InvObj), num_objects, "obj");
for (int i = 0; i < num_objects; i++) {
_G(inventory)->_objects[i] = (InvObj *)mem_get_from_stash(_G(inv_obj_mem_type), "obj");
@@ -86,10 +84,9 @@ bool inv_init(int32 num_objects) {
}
_G(inventory)->_tail = 0;
- return true;
}
-bool inv_register_thing(const Common::String &itemName, const Common::String &itemVerbs,
+void inv_register_thing(const Common::String &itemName, const Common::String &itemVerbs,
int32 scene, int32 cel, int32 cursor) {
char *s_name = mem_strdup(itemName.c_str());
char *s_verbs = mem_strdup(itemVerbs.c_str());
@@ -116,8 +113,6 @@ bool inv_register_thing(const Common::String &itemName, const Common::String &it
if (scene == BACKPACK) {
_G(inventory)->add(s_name, s_verbs, cel, cursor);
}
-
- return true;
}
//-------------------------------------------------------------------
diff --git a/engines/m4/adv_r/adv_inv.h b/engines/m4/adv_r/adv_inv.h
index 26105bbebb8..e15b18e1cf4 100644
--- a/engines/m4/adv_r/adv_inv.h
+++ b/engines/m4/adv_r/adv_inv.h
@@ -51,7 +51,7 @@ struct InventoryBase {
/**
* Init the system, preferably in game_systems_initialize
*/
-bool inv_init(int32 num_objects);
+void inv_init(int32 num_objects);
/**
* Register things during init of the game
@@ -62,7 +62,7 @@ bool inv_init(int32 num_objects);
* @param cel Index into the inventory sprite series for use when displaying inventory
* @param cursor Cel index into the cursor sprite series when the player is "holding" a thing
*/
-bool inv_register_thing(const Common::String &itemName, const Common::String &itemVerbs, int32 scene, int32 cel, int32 cursor);
+void inv_register_thing(const Common::String &itemName, const Common::String &itemVerbs, int32 scene, int32 cel, int32 cursor);
int32 inv_where_is(const Common::String &itemName);
bool inv_player_has(const Common::String &itemName);
diff --git a/engines/m4/adv_r/adv_rails.cpp b/engines/m4/adv_r/adv_rails.cpp
index a02907ea434..387aaabf6e8 100644
--- a/engines/m4/adv_r/adv_rails.cpp
+++ b/engines/m4/adv_r/adv_rails.cpp
@@ -32,13 +32,9 @@ namespace M4 {
#define BOTTOM_EDGE 0x04
#define RIGHT_EDGE 0x08
-bool InitRails() {
- int32 i;
-
+void InitRails() {
// Register with the stash the frequently used structs
- if (!mem_register_stash_type(&_G(rails).memtypePATHN, sizeof(pathNode), 32, "+PATHNODE")) {
- return false;
- }
+ mem_register_stash_type(&_G(rails).memtypePATHN, sizeof(pathNode), 32, "+PATHNODE");
// Create the stack. Since any path through a series of nodes can have at most MAXRAILNODES...
_G(rails).stackBottom = (railNode **)mem_alloc(sizeof(railNode *) * MAXRAILNODES, STR_RAILNODE);
@@ -46,7 +42,7 @@ bool InitRails() {
// Allocate the array of railNode pointers and initialize...
_G(rails).myNodes = (railNode **)mem_alloc(sizeof(railNode *) * MAXRAILNODES, STR_RAILNODE);
- for (i = 0; i < MAXRAILNODES; i++) {
+ for (int32 i = 0; i < MAXRAILNODES; i++) {
_G(rails).myNodes[i] = nullptr;
}
@@ -57,8 +53,6 @@ bool InitRails() {
// Set the parameters and return
_G(rails).noWalkRectList = nullptr;
-
- return true;
}
diff --git a/engines/m4/adv_r/adv_rails.h b/engines/m4/adv_r/adv_rails.h
index 13b976371c4..108510de976 100644
--- a/engines/m4/adv_r/adv_rails.h
+++ b/engines/m4/adv_r/adv_rails.h
@@ -39,7 +39,7 @@ struct Rails_Globals {
int32 memtypePATHN = 0;
};
-bool InitRails();
+void InitRails();
void rail_system_shutdown();
void ClearRails();
noWalkRect *intr_add_no_walk_rect(int32 x1, int32 y1, int32 x2, int32 y2, int32 altX, int32 altY, Buffer *walkCodes);
diff --git a/engines/m4/adv_r/adv_walk.cpp b/engines/m4/adv_r/adv_walk.cpp
index a7c33b0d566..03e3f75d7c6 100644
--- a/engines/m4/adv_r/adv_walk.cpp
+++ b/engines/m4/adv_r/adv_walk.cpp
@@ -251,7 +251,7 @@ void ws_demand_location(machine *myWalker, int32 x, int32 y, int facing) {
return;
}
- frac16 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
+ const frac16 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
_G(globals)[GLB_TEMP_1] = x << 16;
_G(globals)[GLB_TEMP_2] = y << 16;
@@ -269,7 +269,7 @@ static void ws_demand_location_and_facing(machine *myWalker, int32 x, int32 y, i
return;
}
- frac16 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
+ const frac16 s = _G(globals)[GLB_MIN_SCALE] + FixedMul((y << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
_G(globals)[GLB_TEMP_1] = x << 16;
_G(globals)[GLB_TEMP_2] = y << 16;
diff --git a/engines/m4/gui/gui_vmng_core.cpp b/engines/m4/gui/gui_vmng_core.cpp
index 8869ac4988c..598d771e9c6 100644
--- a/engines/m4/gui/gui_vmng_core.cpp
+++ b/engines/m4/gui/gui_vmng_core.cpp
@@ -68,21 +68,16 @@ namespace M4 {
bool vmng_init() {
if (_G(vmng_Initted))
return false;
+
_G(vmng_Initted) = true;
_G(frontScreen) = nullptr;
_G(backScreen) = nullptr;
_G(inactiveScreens) = nullptr;
- if (!mem_register_stash_type(&_G(memtypeSCRN), sizeof(ScreenContext), 32, "+SCRN")) {
- return false;
- }
- if (!mem_register_stash_type(&_G(memtypeMATTE), sizeof(matte), 32, "+guiMATTE")) {
- return false;
- }
- if (!mem_register_stash_type(&_G(memtypeRECT), sizeof(RectList), 256, "+guiRecList")) {
- return false;
- }
+ mem_register_stash_type(&_G(memtypeSCRN), sizeof(ScreenContext), 32, "+SCRN");
+ mem_register_stash_type(&_G(memtypeMATTE), sizeof(matte), 32, "+guiMATTE");
+ mem_register_stash_type(&_G(memtypeRECT), sizeof(RectList), 256, "+guiRecList");
return true;
}
diff --git a/engines/m4/mem/mem.cpp b/engines/m4/mem/mem.cpp
index c378f502a9d..22606f1d4af 100644
--- a/engines/m4/mem/mem.cpp
+++ b/engines/m4/mem/mem.cpp
@@ -47,30 +47,24 @@ void mem_stash_shutdown() {
}
}
-bool mem_register_stash_type(int32 *memType, int32 blockSize, int32 maxNumRequests, const Common::String &name) {
+void mem_register_stash_type(int32 *memType, int32 blockSize, int32 maxNumRequests, const Common::String &name) {
int32 i = 0;
while (i < _MEMTYPE_LIMIT && _G(sizeMem)[i] > 0) {
i++;
}
- if (i == _MEMTYPE_LIMIT)
+ if (i >= _MEMTYPE_LIMIT)
error_show(FL, "stash: %s", name.c_str());
// Found a slot
- if (i < _MEMTYPE_LIMIT) {
- _G(sizeMem)[i] = blockSize;
- *memType = i;
+ _G(sizeMem)[i] = blockSize;
+ *memType = i;
- if (maxNumRequests > MAX_REQUESTS)
- maxNumRequests = MAX_REQUESTS;
+ if (maxNumRequests > MAX_REQUESTS)
+ maxNumRequests = MAX_REQUESTS;
- _G(requests)[i] = maxNumRequests;
- _G(memBlock)[i] = mem_alloc((blockSize + sizeof(uintptr)) * maxNumRequests, name.c_str());
-
- return true;
- }
-
- error_show(FL, "stash: %s", name.c_str());
+ _G(requests)[i] = maxNumRequests;
+ _G(memBlock)[i] = mem_alloc((blockSize + sizeof(uintptr)) * maxNumRequests, name.c_str());
}
void mem_free_to_stash(void *mem, int32 memType) {
@@ -95,9 +89,9 @@ void *mem_get_from_stash(int32 memType, const Common::String &name) {
Common::fill((byte *)result, (byte *)result + _G(sizeMem)[memType], 0);
return result;
- } else {
- b_ptr += _G(sizeMem)[memType] + sizeof(uintptr);
}
+
+ b_ptr += _G(sizeMem)[memType] + sizeof(uintptr);
}
error_show(FL, "stash full %s", name.c_str());
diff --git a/engines/m4/mem/mem.h b/engines/m4/mem/mem.h
index e01e3628810..231c3872e61 100644
--- a/engines/m4/mem/mem.h
+++ b/engines/m4/mem/mem.h
@@ -36,7 +36,7 @@ void mem_stash_init(int16 num_types);
*/
void mem_stash_shutdown();
-bool mem_register_stash_type(int32 *memType, int32 size, int32 numRequests, const Common::String &name);
+void mem_register_stash_type(int32 *memType, int32 size, int32 numRequests, const Common::String &name);
/**
* To free a memory block whose size has been previously registered.
More information about the Scummvm-git-logs
mailing list