thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AD: Allow both MacResFork and non-resfork entries coexist

Browse source
This commit is contained in:
Eugene Sandulenko 2021-10-14 13:55:44 +03:00
parent 33f8e1228a
commit 0e48263e50
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/advancedDetector.cpp
View file

@ -486,10 +486,15 @@ namespace Common {
DECLARE_SINGLETON(MD5CacheManager);
}
static char flagsToMD5Prefix(uint32 flags) {
if (flags & ADGF_MACRESFORK)
return 'm';
return 'f';
}
bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
// FIXME/TODO: We don't handle the case that a file is listed as a regular
// file and as one with resource fork.
Common::String hashname = Common::String::format("%s:%d", fname.c_str(), _md5Bytes);
Common::String hashname = Common::String::format("%c:%s:%d", flagsToMD5Prefix(game.flags), fname.c_str(), _md5Bytes);
if (MD5Man.contains(hashname)) {
fileProps.md5 = MD5Man.getMD5(hashname);