[Scummvm-git-logs] scummvm master -> 8f1b9c91c980ae4a4094dedcfa72d41a1e44056b
sev-
noreply at scummvm.org
Thu Jul 24 10:02:24 UTC 2025
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:
cb3fb3d4b4 MM: Always present all detection entries in the tables
c58e3a8a64 DETECTION: Dump engine name, not human-readable name
eab7575742 AD: Allow dumer method override in subclasses
8f1b9c91c9 SCI: Do not dump detection entries by default
Commit: cb3fb3d4b48cd1e74618e0aa03287e101dd21411
https://github.com/scummvm/scummvm/commit/cb3fb3d4b48cd1e74618e0aa03287e101dd21411
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-07-24T12:01:48+02:00
Commit Message:
MM: Always present all detection entries in the tables
Changed paths:
engines/mm/detection.cpp
engines/mm/detection_tables.h
diff --git a/engines/mm/detection.cpp b/engines/mm/detection.cpp
index 10532b543c9..5c272a54e0a 100644
--- a/engines/mm/detection.cpp
+++ b/engines/mm/detection.cpp
@@ -26,16 +26,12 @@
#include "mm/mm.h"
static const PlainGameDescriptor MIGHT_AND_MAGIC_GAMES[] = {
-#ifdef ENABLE_MM1
{ "mm1", "Might and Magic: Book One - Secret of the Inner Sanctum"},
{ "mm1_enh", "Might and Magic: Book One - Secret of the Inner Sanctum - Enhanced"},
-#endif
-#ifdef ENABLE_XEEN
{ "cloudsofxeen", "Might and Magic IV: Clouds of Xeen" },
{ "darksideofxeen", "Might and Magic V: Darkside of Xeen" },
{ "worldofxeen", "Might and Magic: World of Xeen" },
{ "swordsofxeen", "Might and Magic: Swords of Xeen" },
-#endif
{ 0, 0 }
};
diff --git a/engines/mm/detection_tables.h b/engines/mm/detection_tables.h
index 487caefd597..0c200477213 100644
--- a/engines/mm/detection_tables.h
+++ b/engines/mm/detection_tables.h
@@ -27,7 +27,6 @@ namespace MM {
#define GUIO_XEEN GUIO4(GAMEOPTION_SHOW_ITEM_COSTS, GAMEOPTION_DURABLE_ARMOR, GAMEOPTION_SHOW_HP_SP_BARS, GAMEOPTION_COPY_PROTECTION)
static const MightAndMagicGameDescription GAME_DESCRIPTIONS[] = {
-#ifdef ENABLE_MM1
{
// Might and Magic 1
{
@@ -74,9 +73,7 @@ static const MightAndMagicGameDescription GAME_DESCRIPTIONS[] = {
GType_MightAndMagic1,
GF_GFX_PACK
},
-#endif
-#ifdef ENABLE_XEEN
{
// World of Xeen
{
@@ -407,7 +404,6 @@ static const MightAndMagicGameDescription GAME_DESCRIPTIONS[] = {
GType_Swords,
0
},
-#endif
{ AD_TABLE_END_MARKER, 0, 0 }
};
Commit: c58e3a8a646125dc58a3ef1fae926b6180b04ebb
https://github.com/scummvm/scummvm/commit/c58e3a8a646125dc58a3ef1fae926b6180b04ebb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-07-24T12:01:50+02:00
Commit Message:
DETECTION: Dump engine name, not human-readable name
Changed paths:
engines/advancedDetector.cpp
engines/glk/detection.cpp
engines/scumm/detection.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index c982003febd..cc6072d5ece 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -686,7 +686,7 @@ void AdvancedMetaEngineDetectionBase::dumpDetectionEntries() const {
printf("\tlanguage \"%s\"\n", escapeString(getLanguageLocale(g->language)).c_str());
printf("\tplatform \"%s\"\n", escapeString(getPlatformCode(g->platform)).c_str());
printf("\tsourcefile \"%s\"\n", escapeString(getName()).c_str());
- printf("\tengine \"%s\"\n", escapeString(getEngineName()).c_str());
+ printf("\tengine \"%s\"\n", escapeString(getName()).c_str());
for (auto fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
const char *fname = fileDesc->fileName;
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index c71b5dc5190..871d4df3687 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -366,7 +366,7 @@ void GlkMetaEngineDetection::dumpDetectionEntries() const {
printf("\tlanguage \"%s\"\n", escapeString(getLanguageLocale(entry->_language)).c_str());
printf("\tplatform \"%s\"\n", escapeString(getPlatformCode(entry->_platform)).c_str());
printf("\tsourcefile \"%s\"\n", escapeString(getName()).c_str());
- printf("\tengine \"%s\"\n", escapeString(getEngineName()).c_str());
+ printf("\tengine \"%s\"\n", escapeString(getName()).c_str());
Common::String checksum = entry->_md5;
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index c2f841bad18..760bbf11d00 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -158,7 +158,7 @@ static int compareTreeNodes(const void *a, const void *b) {
printf("\tlanguage \"%s\"\n", escapeString(getLanguageLocale(entry->language)).c_str());
printf("\tplatform \"%s\"\n", escapeString(getPlatformCode(entry->platform)).c_str());
printf("\tsourcefile \"%s\"\n", escapeString(getName()).c_str());
- printf("\tengine \"%s\"\n", escapeString("SCUMM").c_str());
+ printf("\tengine \"%s\"\n", escapeString("scumm").c_str());
// Match the appropriate file name for the current game variant.
GameFilenamePattern gameEntry = matchGameFilenamePattern(entry);
Commit: eab7575742aceabdaf11da7267a28169e873572f
https://github.com/scummvm/scummvm/commit/eab7575742aceabdaf11da7267a28169e873572f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-07-24T12:01:50+02:00
Commit Message:
AD: Allow dumer method override in subclasses
Changed paths:
engines/advancedDetector.h
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 25717d1f24e..fc9ef3a81b8 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -524,7 +524,7 @@ public:
return count;
}
- void dumpDetectionEntries() const override final;
+ void dumpDetectionEntries() const override;
/**
* Sanitizes a string to be usable by gameId
Commit: 8f1b9c91c980ae4a4094dedcfa72d41a1e44056b
https://github.com/scummvm/scummvm/commit/8f1b9c91c980ae4a4094dedcfa72d41a1e44056b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-07-24T12:01:50+02:00
Commit Message:
SCI: Do not dump detection entries by default
It will live in a separate file, thus, manual recompilation
will be required
Changed paths:
engines/sci/detection.cpp
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index f5112675d3f..a88a5570cac 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -218,6 +218,8 @@ public:
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist, ADDetectedGameExtraInfo **extra) const override;
+ void dumpDetectionEntries() const override;
+
private:
void addFileToDetectedGame(const Common::Path &name, const FileMap &allFiles, MD5Properties md5Prop, ADDetectedGame &game) const;
};
@@ -314,6 +316,12 @@ void SciMetaEngineDetection::addFileToDetectedGame(const Common::Path &name, con
}
}
+void SciMetaEngineDetection::dumpDetectionEntries() const {
+#if 0
+ AdvancedMetaEngineDetectionBase::dumpDetectionEntries();
+#endif
+}
+
} // End of namespace Sci
REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sci::SciMetaEngineDetection);
More information about the Scummvm-git-logs
mailing list