[Scummvm-git-logs] scummvm master -> 39299ed231918fe47023a1789434e8dbc7ab9a55
Helco
noreply at scummvm.org
Sun Oct 19 15:02:22 UTC 2025
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:
39299ed231 ALCACHOFA: Fix undefined reference to kMapFiles
Commit: 39299ed231918fe47023a1789434e8dbc7ab9a55
https://github.com/scummvm/scummvm/commit/39299ed231918fe47023a1789434e8dbc7ab9a55
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-10-19T16:59:31+02:00
Commit Message:
ALCACHOFA: Fix undefined reference to kMapFiles
Changed paths:
engines/alcachofa/detection.h
engines/alcachofa/game-movie-adventure.cpp
diff --git a/engines/alcachofa/detection.h b/engines/alcachofa/detection.h
index 0c8ce953738..67350e5a095 100644
--- a/engines/alcachofa/detection.h
+++ b/engines/alcachofa/detection.h
@@ -46,7 +46,7 @@ struct AlcachofaGameDescription {
ADGameDescription desc;
- EngineVersion engineVersion;
+ EngineVersion engineVersion = EngineVersion::V3_0;
inline bool isVersionBetween(int min, int max) const {
int intVersion = (int)engineVersion;
diff --git a/engines/alcachofa/game-movie-adventure.cpp b/engines/alcachofa/game-movie-adventure.cpp
index a9a5662fba3..54611ba097c 100644
--- a/engines/alcachofa/game-movie-adventure.cpp
+++ b/engines/alcachofa/game-movie-adventure.cpp
@@ -188,21 +188,22 @@ static constexpr const ScriptKernelTask kScriptKernelTaskMapV31[] = {
ScriptKernelTask::LerpCamToObjectKeepingZ
};
+static constexpr const char *kMapFiles[] = { // not really inherent to V3 but holds true for all V3 games
+ "MAPAS/MAPA5.EMC",
+ "MAPAS/MAPA4.EMC",
+ "MAPAS/MAPA3.EMC",
+ "MAPAS/MAPA2.EMC",
+ "MAPAS/MAPA1.EMC",
+ "MAPAS/GLOBAL.EMC",
+ nullptr
+};
+
class GameWithVersion3 : public Game {
public:
Point getResolution() override {
return Point(1024, 768);
}
- static constexpr const char *kMapFiles[] = { // not really inherent to V3 but holds true for all V3 games
- "MAPAS/MAPA5.EMC",
- "MAPAS/MAPA4.EMC",
- "MAPAS/MAPA3.EMC",
- "MAPAS/MAPA2.EMC",
- "MAPAS/MAPA1.EMC",
- "MAPAS/GLOBAL.EMC",
- nullptr
- };
const char *const *getMapFiles() override {
return kMapFiles;
}
More information about the Scummvm-git-logs
mailing list