piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 14:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

fail gracefully when ROM loading fails

Browse Source
This commit is contained in:
StapleButter
2017-10-11 00:01:05 +02:00
parent a15c395460
commit ee1da52d77
4 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/NDSCart.cpp
View File

@ -817,15 +817,14 @@ bool LoadROM(const char* path, bool direct)
// TODO: streaming mode? for really big ROMs or systems with limited RAM
// for now we're lazy
if (CartROM) delete[] CartROM;
FILE* f = fopen(path, "rb");
if (!f)
{
printf("Failed to open ROM file %s\n", path);
return false;
}
NDS::Reset();
fseek(f, 0, SEEK_END);
u32 len = (u32)ftell(f);
@ -845,6 +844,11 @@ bool LoadROM(const char* path, bool direct)
fclose(f);
//CartROM = f;
// generate a ROM ID
// note: most games don't check the actual value
// it just has to stay the same throughout gameplay
CartID = 0x00001FC2;
if (direct)
{
NDS::SetupDirectBoot();
@ -853,11 +857,6 @@ bool LoadROM(const char* path, bool direct)
CartInserted = true;
// generate a ROM ID
// note: most games don't check the actual value
// it just has to stay the same throughout gameplay
CartID = 0x00001FC2;
u32 arm9base = *(u32*)&CartROM[0x20];
if (arm9base < 0x8000)
{