ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cheats: Fix hash-suffixed files incorrectly loading

This commit is contained in:
Stenzek 2024-12-10 20:18:44 +10:00
parent e137d3b5c7
commit cc567d9498
No known key found for this signature in database
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/cheats.cpp
View File

@ -350,15 +350,16 @@ std::vector<std::string> Cheats::FindChtFilesOnDisk(const std::string_view seria
std::vector<std::string> ret; std::vector<std::string> ret;
FileSystem::FindResultsArray files; FileSystem::FindResultsArray files;
FileSystem::FindFiles(cheats ? EmuFolders::Cheats.c_str() : EmuFolders::Patches.c_str(), FileSystem::FindFiles(cheats ? EmuFolders::Cheats.c_str() : EmuFolders::Patches.c_str(),
GetChtTemplate(serial, hash, true).c_str(), GetChtTemplate(serial, std::nullopt, true).c_str(),
FILESYSTEM_FIND_FILES | FILESYSTEM_FIND_HIDDEN_FILES, &files); FILESYSTEM_FIND_FILES | FILESYSTEM_FIND_HIDDEN_FILES, &files);
ret.reserve(files.size()); ret.reserve(files.size());
for (FILESYSTEM_FIND_DATA& fd : files) for (FILESYSTEM_FIND_DATA& fd : files)
{ {
// Skip mismatched hashes. // Skip mismatched hashes.
if (hash.has_value()) if (hash.has_value())
{ {
if (const std::string_view filename = Path::GetFileTitle(fd.FileName); filename.length() >= serial.length() + 18) if (const std::string_view filename = Path::GetFileTitle(fd.FileName); filename.length() >= serial.length() + 17)
{ {
const std::string_view filename_hash = filename.substr(serial.length() + 1, 16); const std::string_view filename_hash = filename.substr(serial.length() + 1, 16);
const std::optional filename_parsed_hash = StringUtil::FromChars<GameHash>(filename_hash, 16); const std::optional filename_parsed_hash = StringUtil::FromChars<GameHash>(filename_hash, 16);
@ -431,12 +432,12 @@ void Cheats::EnumerateChtFiles(const std::string_view serial, std::optional<Game
std::vector<std::string> disk_patch_files; std::vector<std::string> disk_patch_files;
if (for_ui || !Achievements::IsHardcoreModeActive()) if (for_ui || !Achievements::IsHardcoreModeActive())
{ {
disk_patch_files = FindChtFilesOnDisk(serial, for_ui ? hash : std::nullopt, cheats); disk_patch_files = FindChtFilesOnDisk(serial, for_ui ? std::nullopt : hash, cheats);
if (cheats && disk_patch_files.empty()) if (cheats && disk_patch_files.empty())
{ {
// Check if there's an old-format titled file. // Check if there's an old-format titled file.
if (ImportOldChtFile(serial)) if (ImportOldChtFile(serial))
disk_patch_files = FindChtFilesOnDisk(serial, for_ui ? hash : std::nullopt, cheats); disk_patch_files = FindChtFilesOnDisk(serial, for_ui ? std::nullopt : hash, cheats);
} }
} }