[Scummvm-git-logs] scummvm master -> 68b85967aa2ae047cc24f10173e001900ae0e19b
Helco
noreply at scummvm.org
Thu Feb 5 17:52:18 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:
68b85967aa ALCACHOFA: Fix compiler warnings on GCC
Commit: 68b85967aa2ae047cc24f10173e001900ae0e19b
https://github.com/scummvm/scummvm/commit/68b85967aa2ae047cc24f10173e001900ae0e19b
Author: Helco (hermann.noll at hotmail.com)
Date: 2026-02-05T18:51:57+01:00
Commit Message:
ALCACHOFA: Fix compiler warnings on GCC
-Wswitch in ui-objects.cpp
-Wc++14-extensions in rooms .cpp
-Wmaybe-uninitialized in common.h
Changed paths:
engines/alcachofa/common.h
engines/alcachofa/rooms.cpp
engines/alcachofa/ui-objects.cpp
diff --git a/engines/alcachofa/common.h b/engines/alcachofa/common.h
index b498a7b5bc7..519479b36de 100644
--- a/engines/alcachofa/common.h
+++ b/engines/alcachofa/common.h
@@ -166,7 +166,7 @@ inline void syncStack(
serializer.syncAsUint32LE(size);
if (serializer.isLoading()) {
for (uint i = 0; i < size; i++) {
- T value;
+ T value = {};
serializeFunction(serializer, value);
stack.push(value);
}
diff --git a/engines/alcachofa/rooms.cpp b/engines/alcachofa/rooms.cpp
index 6f14b979e4e..4de14e1ce0f 100644
--- a/engines/alcachofa/rooms.cpp
+++ b/engines/alcachofa/rooms.cpp
@@ -780,14 +780,14 @@ bool World::loadWorldFileV1(const char *path) {
const auto readGlobalAnim = [&] (
GlobalAnimationKind kind1,
- GlobalAnimationKind kind2 = GlobalAnimationKind::Count) {
+ GlobalAnimationKind kind2) {
auto fileRef = readFileRef(*file);
_globalAnimations[(int)kind1] = fileRef;
if (kind2 != GlobalAnimationKind::Count)
_globalAnimations[(int)kind2] = fileRef;
};
readGlobalAnim(GlobalAnimationKind::GeneralFont, GlobalAnimationKind::DialogFont);
- readGlobalAnim(GlobalAnimationKind::Cursor);
+ readGlobalAnim(GlobalAnimationKind::Cursor, GlobalAnimationKind::Count);
readGlobalAnim(GlobalAnimationKind::FilemonIcon, GlobalAnimationKind::FilemonDisabledIcon); // note this is swapped in V1
readGlobalAnim(GlobalAnimationKind::MortadeloIcon, GlobalAnimationKind::MortadeloDisabledIcon);
readGlobalAnim(GlobalAnimationKind::InventoryIcon, GlobalAnimationKind::InventoryDisabledIcon);
diff --git a/engines/alcachofa/ui-objects.cpp b/engines/alcachofa/ui-objects.cpp
index ca39d4c253f..342322f5e8b 100644
--- a/engines/alcachofa/ui-objects.cpp
+++ b/engines/alcachofa/ui-objects.cpp
@@ -92,11 +92,15 @@ void ButtonV1::draw() {
text = "ENTRAR VACIA";
break;
case MainMenuAction::OptionsMenu:
+ {
int volumePercent = g_engine->config().musicVolume() * 10 / Audio::Mixer::kMaxChannelVolume;
snprintf(buffer, kBufferSize, "%s: %d", "VOLUMEN", volumePercent * 10);
text = buffer;
break;
}
+ default:
+ break;
+ }
if (text != nullptr) {
g_engine->drawQueue().add<TextDrawRequest>(
g_engine->globalUI().dialogFont(),
More information about the Scummvm-git-logs
mailing list