libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 11:36:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: TADS: Improved detection to detect TADS version

Browse Source
This commit is contained in:
Paul Gilbert 2019-05-16 11:52:32 -10:00
parent b1f8e2ce83
commit 54d240d81f
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
engines/glk/tads/detection.cpp
View File

@ -59,7 +59,7 @@ GameDescriptor TADSMetaEngine::findGame(const char *gameId) {
} }
bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) { bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) {
const char *const EXTENSIONS[] = { ".gam", nullptr }; const char *const EXTENSIONS[] = { ".gam", ".t3", nullptr };
// Loop through the files of the folder // Loop through the files of the folder
for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
@ -68,7 +68,8 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
continue; continue;
Common::String filename = file->getName(); Common::String filename = file->getName();
bool hasExt = Blorb::hasBlorbExt(filename), isBlorb = false; bool hasExt = Blorb::hasBlorbExt(filename), isBlorb = true;
int tadsVersion = -1;
for (const char *const *ext = &EXTENSIONS[0]; *ext && !hasExt; ++ext) for (const char *const *ext = &EXTENSIONS[0]; *ext && !hasExt; ++ext)
hasExt = filename.hasSuffixIgnoreCase(*ext); hasExt = filename.hasSuffixIgnoreCase(*ext);
if (!hasExt) if (!hasExt)
@ -81,10 +82,21 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
Common::String md5 = Common::computeStreamMD5AsString(gameFile, 5000); Common::String md5 = Common::computeStreamMD5AsString(gameFile, 5000);
size_t filesize = gameFile.size(); size_t filesize = gameFile.size();
gameFile.seek(0); gameFile.seek(0);
isBlorb = Blorb::isBlorb(gameFile, ID_TAD2) || Blorb::isBlorb(gameFile, ID_TAD3); if (Blorb::isBlorb(gameFile, ID_TAD2))
tadsVersion = 2;
else if (Blorb::isBlorb(gameFile, ID_TAD3))
tadsVersion = 3;
else
isBlorb = false;
if (!isBlorb)
// Figure out the TADS version
tadsVersion = getTADSVersion(gameFile);
gameFile.close(); gameFile.close();
if (!isBlorb && Blorb::hasBlorbExt(filename)) if (tadsVersion == -1)
// Not a TADS game, or Blorb containing TADS game, so can be ignored
continue; continue;
// Check for known games // Check for known games
@ -95,15 +107,15 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
DetectedGame gd; DetectedGame gd;
if (!p->_gameId) { if (!p->_gameId) {
if (gDebugLevel > 0) { if (gDebugLevel > 0) {
// Print an entry suitable for putting into the detection_tables.h, using the // Print an entry suitable for putting into the detection_tables.h
Common::String fname = filename; Common::String fname = filename;
const char *dot = strchr(fname.c_str(), '.'); const char *dot = strchr(fname.c_str(), '.');
if (dot) if (dot)
fname = Common::String(fname.c_str(), dot); fname = Common::String(fname.c_str(), dot);
debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), (uint)filesize); debug("TADS%d ENTRY0(\"%s\", \"%s\", %u),", tadsVersion, fname.c_str(), md5.c_str(), (uint)filesize);
} }
const GameDescriptor &desc = TADS2_GAME_LIST[0]; const GameDescriptor &desc = tadsVersion == 2 ? TADS2_GAME_LIST[0] : TADS3_GAME_LIST[0];
gd = DetectedGame(desc._gameId, desc._description, Common::UNK_LANG, Common::kPlatformUnknown); gd = DetectedGame(desc._gameId, desc._description, Common::UNK_LANG, Common::kPlatformUnknown);
} else { } else {
PlainGameDescriptor gameDesc = findGame(p->_gameId); PlainGameDescriptor gameDesc = findGame(p->_gameId);
@ -130,5 +142,20 @@ void TADSMetaEngine::detectClashes(Common::StringMap &map) {
} }
} }
int TADSMetaEngine::getTADSVersion(Common::SeekableReadStream &game) {
// Read in the start of the file
char buffer[16];
game.seek(0);
game.read(buffer, 16);
// Check for valid game headers
if (memcmp(buffer, "TADS2 bin\n\r\032", 12) == 0)
return 2;
else if (memcmp(buffer, "T3-image\r\n\032", 11) == 0)
return 3;
else
return -1;
}
} // End of namespace TADS } // End of namespace TADS
} // End of namespace Glk } // End of namespace Glk

7
engines/glk/tads/detection.h
View File

@ -56,6 +56,13 @@ public:
* Check for game Id clashes with other sub-engines * Check for game Id clashes with other sub-engines
*/ */
static void detectClashes(Common::StringMap &map); static void detectClashes(Common::StringMap &map);
/**
* Determines whether the given game is TADS 2 or 3
* @param game Open stream pointing to game file
* @returns 2 for TADS 2, 3 for TADS 3, or -1 for error
*/
static int getTADSVersion(Common::SeekableReadStream &game);
}; };
} // End of namespace TADS } // End of namespace TADS