ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

naomi: use crc to find roms

This commit is contained in:
Flyinghead 2020-01-24 23:55:54 +01:00
parent 7d33816d25
commit 81c9312fb4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/hw/naomi/naomi_cart.cpp
View File

@ -97,8 +97,16 @@ static bool naomi_LoadBios(const char *filename, Archive *child_archive, Archive
else
{
std::unique_ptr<ArchiveFile> file;
// Find by CRC
if (child_archive != NULL)
file.reset(child_archive->OpenFile(bios->blobs[romid].filename));
file.reset(child_archive->OpenFileByCrc(bios->blobs[romid].crc));
if (!file && parent_archive != NULL)
file.reset(parent_archive->OpenFileByCrc(bios->blobs[romid].crc));
if (!file && bios_archive != NULL)
file.reset(bios_archive->OpenFileByCrc(bios->blobs[romid].crc));
// Fallback to find by filename
if (!file && child_archive != NULL)
file.reset(child_archive->OpenFile(bios->blobs[romid].filename));
if (!file && parent_archive != NULL)
file.reset(parent_archive->OpenFile(bios->blobs[romid].filename));
if (!file && bios_archive != NULL)
@ -269,9 +277,15 @@ static void naomi_cart_LoadZip(const char *filename)
else
{
std::unique_ptr<ArchiveFile> file;
// Find by CRC
if (archive != NULL)
file.reset(archive->OpenFileByCrc(game->blobs[romid].crc));
if (!file && parent_archive != NULL)
file.reset(parent_archive->OpenFileByCrc(game->blobs[romid].crc));
// Fallback to find by filename
if (!file && archive != NULL)
file.reset(archive->OpenFile(game->blobs[romid].filename));
if (file == NULL && parent_archive != NULL)
if (!file && parent_archive != NULL)
file.reset(parent_archive->OpenFile(game->blobs[romid].filename));
if (!file) {
WARN_LOG(NAOMI, "%s: Cannot open %s", filename, game->blobs[romid].filename);