[Scummvm-git-logs] scummvm master -> 80104022d6a3268e070d418a86646ac49bb6c7c6
bluegr
noreply at scummvm.org
Thu Nov 21 15:55:50 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3a905b9091 TOLTECS: Move detection entries into a separate file
80104022d6 TOLTECS: Support the original demo file structure - bug #13231
Commit: 3a905b909199c41e45a54bd53f0be99b1c06bd1e
https://github.com/scummvm/scummvm/commit/3a905b909199c41e45a54bd53f0be99b1c06bd1e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-21T17:55:24+02:00
Commit Message:
TOLTECS: Move detection entries into a separate file
Changed paths:
A engines/toltecs/detection_tables.h
engines/toltecs/detection.cpp
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 122fb26b606..562f8d37773 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -38,188 +38,7 @@ static const PlainGameDescriptor toltecsGames[] = {
};
-namespace Toltecs {
-
-static const ToltecsGameDescription gameDescriptions[] = {
-
- {
- // 3 Skulls of the Toltecs English version
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "05472037e9cfde146e953c434e74f0f4", 337643527),
- Common::EN_ANY,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs English version (alternate)
- // From bug #6393
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "a9c9cfef9d05b8f7a5573b626fa4ea87", 337643527),
- Common::EN_ANY,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs PIRATE CD-RIP version (no audio)
- // == DO NOT RE-ADD ==
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "56d0da91ec3db8ac869594357584e851", 104804435),
- Common::EN_ANY,
- Common::kPlatformDOS,
- ADGF_PIRATED,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs Russian version
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "ba1742d3193b68ceb9434e2ab7a09a9b", 391462783),
- Common::RU_RUS,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs German version
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "1a3292bad8e0bb5701800c73531dd75e", 345176617),
- Common::DE_DEU,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs Polish version
- // Reported by cachaito in Trac#11134
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "8ec48dd4e52a822d314418f1d3284e64", 337646148),
- Common::PL_POL,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs French version
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "4fb845635cbdac732453fe23be350df9", 327269545),
- Common::FR_FRA,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs Spanish version
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "479f468beccc1b0ce5873ec523d1380e", 308391018),
- Common::ES_ESP,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs Hungarian version
- // From bug #5902
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "69a5572e75409d8c6230b787faa353af", 337647960),
- Common::HU_HUN,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs Czech version
- // Reported by AfBu in Trac#11263
- {
- "toltecs",
- 0,
- AD_ENTRY1s("WESTERN", "57503131c0217c76b07d0b5c14805631", 337644552),
- Common::CS_CZE,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs English Demo version
- {
- "toltecs",
- "Demo",
- AD_ENTRY1s("WESTERN", "53a0abd1c0bc5cad8ba18f0e56877705", 46241833),
- Common::EN_ANY,
- Common::kPlatformDOS,
- ADGF_DEMO,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // 3 Skulls of the Toltecs German Demo version
- {
- "toltecs",
- "Demo",
- AD_ENTRY1s("WESTERN", "1c85e82712d24f1d5c1ea2a66ddd75c2", 47730038),
- Common::DE_DEU,
- Common::kPlatformDOS,
- ADGF_DEMO,
- GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
- },
- },
-
- {
- // Fenimore Fillmore: 3 Skulls of the Toltecs, 2019 Casual Brothers remaster (GOG, Steam)
- {
- "toltecs",
- MetaEngineDetection::GAME_NOT_IMPLEMENTED, // Reason for being unsupported
- AD_ENTRY1s("RData.lzma", "e0adae53ab5e821595a64032a4c2d5bc", 653477695),
- Common::UNK_LANG,
- Common::kPlatformWindows,
- ADGF_REMASTERED | ADGF_UNSUPPORTED,
- GUIO1(GUIO_NONE)
- }
- },
-
- { AD_TABLE_END_MARKER }
-};
-
-} // End of namespace Toltecs
+#include "toltecs/detection_tables.h"
class ToltecsMetaEngineDetection : public AdvancedMetaEngineDetection<Toltecs::ToltecsGameDescription> {
public:
diff --git a/engines/toltecs/detection_tables.h b/engines/toltecs/detection_tables.h
new file mode 100644
index 00000000000..2bdf3d0f784
--- /dev/null
+++ b/engines/toltecs/detection_tables.h
@@ -0,0 +1,203 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Toltecs {
+
+static const ToltecsGameDescription gameDescriptions[] = {
+
+ {
+ // 3 Skulls of the Toltecs English version
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "05472037e9cfde146e953c434e74f0f4", 337643527),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs English version (alternate)
+ // From bug #6393
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "a9c9cfef9d05b8f7a5573b626fa4ea87", 337643527),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs PIRATE CD-RIP version (no audio)
+ // == DO NOT RE-ADD ==
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "56d0da91ec3db8ac869594357584e851", 104804435),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_PIRATED,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs Russian version
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "ba1742d3193b68ceb9434e2ab7a09a9b", 391462783),
+ Common::RU_RUS,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs German version
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "1a3292bad8e0bb5701800c73531dd75e", 345176617),
+ Common::DE_DEU,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs Polish version
+ // Reported by cachaito in Trac#11134
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "8ec48dd4e52a822d314418f1d3284e64", 337646148),
+ Common::PL_POL,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs French version
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "4fb845635cbdac732453fe23be350df9", 327269545),
+ Common::FR_FRA,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs Spanish version
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "479f468beccc1b0ce5873ec523d1380e", 308391018),
+ Common::ES_ESP,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs Hungarian version
+ // From bug #5902
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "69a5572e75409d8c6230b787faa353af", 337647960),
+ Common::HU_HUN,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs Czech version
+ // Reported by AfBu in Trac#11263
+ {
+ "toltecs",
+ 0,
+ AD_ENTRY1s("WESTERN", "57503131c0217c76b07d0b5c14805631", 337644552),
+ Common::CS_CZE,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs English Demo version
+ {
+ "toltecs",
+ "Demo",
+ AD_ENTRY1s("WESTERN", "53a0abd1c0bc5cad8ba18f0e56877705", 46241833),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_DEMO,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // 3 Skulls of the Toltecs German Demo version
+ {
+ "toltecs",
+ "Demo",
+ AD_ENTRY1s("WESTERN", "1c85e82712d24f1d5c1ea2a66ddd75c2", 47730038),
+ Common::DE_DEU,
+ Common::kPlatformDOS,
+ ADGF_DEMO,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
+ {
+ // Fenimore Fillmore: 3 Skulls of the Toltecs, 2019 Casual Brothers remaster (GOG, Steam)
+ {
+ "toltecs",
+ MetaEngineDetection::GAME_NOT_IMPLEMENTED, // Reason for being unsupported
+ AD_ENTRY1s("RData.lzma", "e0adae53ab5e821595a64032a4c2d5bc", 653477695),
+ Common::UNK_LANG,
+ Common::kPlatformWindows,
+ ADGF_REMASTERED | ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NONE)
+ }
+ },
+
+ { AD_TABLE_END_MARKER }
+};
+
+} // End of namespace Toltecs
Commit: 80104022d6a3268e070d418a86646ac49bb6c7c6
https://github.com/scummvm/scummvm/commit/80104022d6a3268e070d418a86646ac49bb6c7c6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-21T17:55:25+02:00
Commit Message:
TOLTECS: Support the original demo file structure - bug #13231
Changed paths:
engines/toltecs/detection_tables.h
engines/toltecs/toltecs.cpp
diff --git a/engines/toltecs/detection_tables.h b/engines/toltecs/detection_tables.h
index 2bdf3d0f784..aa7321c2ccb 100644
--- a/engines/toltecs/detection_tables.h
+++ b/engines/toltecs/detection_tables.h
@@ -171,6 +171,19 @@ static const ToltecsGameDescription gameDescriptions[] = {
},
},
+ {
+ // 3 Skulls of the Toltecs English Demo version (original file layout)
+ {
+ "toltecs",
+ "Demo",
+ AD_ENTRY1s("english.pdi/WESTERN", "53a0abd1c0bc5cad8ba18f0e56877705", 46241833),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_DEMO,
+ GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+ },
+ },
+
{
// 3 Skulls of the Toltecs German Demo version
{
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index 35da4c039ad..e25d8775bbf 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -107,6 +107,9 @@ ToltecsEngine::ToltecsEngine(OSystem *syst, const ToltecsGameDescription *gameDe
_saveLoadRequested = 0;
_isSaveAllowed = true;
+
+ const Common::FSNode gameDataDir(ConfMan.getPath("path"));
+ SearchMan.addSubDirectoryMatching(gameDataDir, "english.pdi");
}
ToltecsEngine::~ToltecsEngine() {
More information about the Scummvm-git-logs
mailing list