Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 09:50:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

romload: BIOS flag should apply to fills (and remove zero-value comments)

Browse Source
This commit is contained in:
Vas Crabb 2019-02-28 00:05:36 +11:00
parent 1be604b113
commit d6ad44f385
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/emu/romload.cpp
View File

@ -32,14 +32,9 @@
static osd_file::error common_process_file(emu_options &options, const char *location, const char *ext, const rom_entry *romp, emu_file &image_file) static osd_file::error common_process_file(emu_options &options, const char *location, const char *ext, const rom_entry *romp, emu_file &image_file)
{ {
osd_file::error filerr; return (location && *location)
? image_file.open(location, PATH_SEPARATOR, ROM_GETNAME(romp), ext)
if (location != nullptr && strcmp(location, "") != 0) : image_file.open(ROM_GETNAME(romp), ext);
filerr = image_file.open(location, PATH_SEPARATOR, ROM_GETNAME(romp), ext);
else
filerr = image_file.open(ROM_GETNAME(romp), ext);
return filerr;
} }
std::unique_ptr<emu_file> common_process_file(emu_options &options, const char *location, bool has_crc, u32 crc, const rom_entry *romp, osd_file::error &filerr) std::unique_ptr<emu_file> common_process_file(emu_options &options, const char *location, bool has_crc, u32 crc, const rom_entry *romp, osd_file::error &filerr)
@ -860,29 +855,29 @@ void rom_load_manager::process_rom_entries(const char *regiontag, const rom_entr
/* loop until we hit the end of this region */ /* loop until we hit the end of this region */
while (!ROMENTRY_ISREGIONEND(romp)) while (!ROMENTRY_ISREGIONEND(romp))
{ {
/* if this is a continue entry, it's invalid */
if (ROMENTRY_ISCONTINUE(romp)) if (ROMENTRY_ISCONTINUE(romp))
fatalerror("Error in RomModule definition: ROM_CONTINUE not preceded by ROM_LOAD\n"); fatalerror("Error in RomModule definition: ROM_CONTINUE not preceded by ROM_LOAD\n");
/* if this is an ignore entry, it's invalid */
if (ROMENTRY_ISIGNORE(romp)) if (ROMENTRY_ISIGNORE(romp))
fatalerror("Error in RomModule definition: ROM_IGNORE not preceded by ROM_LOAD\n"); fatalerror("Error in RomModule definition: ROM_IGNORE not preceded by ROM_LOAD\n");
/* if this is a reload entry, it's invalid */
if (ROMENTRY_ISRELOAD(romp)) if (ROMENTRY_ISRELOAD(romp))
fatalerror("Error in RomModule definition: ROM_RELOAD not preceded by ROM_LOAD\n"); fatalerror("Error in RomModule definition: ROM_RELOAD not preceded by ROM_LOAD\n");
/* handle fills */
if (ROMENTRY_ISFILL(romp)) if (ROMENTRY_ISFILL(romp))
fill_rom_data(romp++); {
if (!ROM_GETBIOSFLAGS(romp) || ROM_GETBIOSFLAGS(romp) == device->system_bios())
fill_rom_data(romp);
/* handle copies */ romp++;
}
else if (ROMENTRY_ISCOPY(romp)) else if (ROMENTRY_ISCOPY(romp))
{
copy_rom_data(romp++); copy_rom_data(romp++);
}
/* handle files */
else if (ROMENTRY_ISFILE(romp)) else if (ROMENTRY_ISFILE(romp))
{ {
/* handle files */
int irrelevantbios = (ROM_GETBIOSFLAGS(romp) != 0 && ROM_GETBIOSFLAGS(romp) != device->system_bios()); int irrelevantbios = (ROM_GETBIOSFLAGS(romp) != 0 && ROM_GETBIOSFLAGS(romp) != device->system_bios());
const rom_entry *baserom = romp; const rom_entry *baserom = romp;
int explength = 0; int explength = 0;
@ -941,7 +936,7 @@ void rom_load_manager::process_rom_entries(const char *regiontag, const rom_entr
} }
else else
{ {
romp++; /* something else; skip */ romp++; // something else - skip
} }
} }
} }