mister-devel/Main_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/Main_MiSTer.git synced 2026-05-17 03:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify findGameAsset logic with additional early returns.

Browse Source
This commit is contained in:
José Manuel Barroso Galindo
2026-04-23 01:53:17 +02:00
parent 4af4a814ce
commit 35c2111b19
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
file_io.cpp
View File

@@ -2271,35 +2271,36 @@ int findGameAsset(char *path, size_t path_len, const char *rom_path, uint32_t ro
strcat(path, ext);
}
if (is_psx() && !validAsset(path, validator))
if (validAsset(path, validator)) {
return 1;
}
else if (is_psx())
{
if (!findPsxAsset(path, path_len, rom_path, ext, core_dir, validator))
{
return 0;
}
}
else if (!validAsset(path, validator))
else
{
if (!(pcecd_using_cd() || is_megacd()) || !findAssetInSameDir(path, path_len, rom_path, ext) || !validAsset(path, validator))
if (pcecd_using_cd() || is_megacd())
{
const char *rom_name = strrchr(rom_path, '/');
if (rom_name)
if (findAssetInSameDir(path, path_len, rom_path, ext) && validAsset(path, validator))
{
snprintf(path, path_len, "%s%s", pcecd_using_cd() ? pcecd_dir : core_dir, rom_name);
char *p = strrchr(path, '.');
if (p) *p = 0;
if (pcecd_using_cd() || is_megacd()) strcat(path, " []");
strcat(path, ext);
if (!validAsset(path, validator))
{
if (!findAssetByCrc(path, path_len, romcrc, ext, core_dir) || !validAsset(path, validator))
{
return 0;
}
}
return 1;
}
else
}
const char *rom_name = strrchr(rom_path, '/');
if (rom_name)
{
snprintf(path, path_len, "%s%s", pcecd_using_cd() ? pcecd_dir : core_dir, rom_name);
char *p = strrchr(path, '.');
if (p) *p = 0;
if (pcecd_using_cd() || is_megacd()) strcat(path, " []");
strcat(path, ext);
if (!validAsset(path, validator))
{
if (!findAssetByCrc(path, path_len, romcrc, ext, core_dir) || !validAsset(path, validator))
{
@@ -2307,6 +2308,13 @@ int findGameAsset(char *path, size_t path_len, const char *rom_path, uint32_t ro
}
}
}
else
{
if (!findAssetByCrc(path, path_len, romcrc, ext, core_dir) || !validAsset(path, validator))
{
return 0;
}
}
}
return 1;