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

naomi: crash when loading a legacy .bin rom 

Fixes MINIDUMP-1DA, MINIDUMP-1D8, MINIDUMP-1EM
This commit is contained in:
Flyinghead 2023-09-14 15:08:56 +02:00
parent 7e1dcf9003
commit e1b4d4d703
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,12 +627,15 @@ void naomi_cart_LoadRom(const std::string& path, const std::string& fileName, Lo
{
bool systemSP = memcmp(bootId.boardName, "SystemSP", 8) == 0;
std::string gameId = trim_trailing_ws(std::string(bootId.gameTitle[systemSP ? 1 : 0], &bootId.gameTitle[systemSP ? 1 : 0][32]));
std::string romName;
if (CurrentCartridge->game != nullptr)
romName = CurrentCartridge->game->name;
if (gameId == "SAMPLE GAME MAX LONG NAME-")
{
// Use better game names
if (!strcmp(CurrentCartridge->game->name, "sgdrvsim"))
if (romName == "sgdrvsim")
gameId = "SEGA DRIVING SIMULATOR";
else if (!strcmp(CurrentCartridge->game->name, "dragntr3"))
else if (romName == "dragntr3")
gameId = "DRAGON TREASURE 3";
}
if (!gameId.empty())
@ -677,12 +680,12 @@ void naomi_cart_LoadRom(const std::string& path, const std::string& fileName, Lo
if (gameId == " TOUCH DE UNOH -------------"
|| gameId == " TOUCH DE UNOH 2 -----------"
// only for F355 Deluxe
|| (gameId == "F355 CHALLENGE JAPAN" && !strcmp(CurrentCartridge->game->name, "f355")))
|| (gameId == "F355 CHALLENGE JAPAN" && romName == "f355"))
{
printer::init();
}
if (!strcmp(CurrentCartridge->game->name, "clubkprz") || !strncmp(CurrentCartridge->game->name, "clubkpz", 7)
|| !strncmp(CurrentCartridge->game->name, "shootpl", 7)
if (romName == "clubkprz" || romName.substr(0, 7) == "clubkpz"
|| romName.substr(0, 7) == "shootpl"
|| gameId == "KICK '4' CASH")
{
hopper::init();