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

- Fixed issue with image empty slot [Miodrag Milanovic]

Browse Source 
- Default for writeconfig is now 0 for MESS since it is not needed anymore
- Fixed handling of mounted devices on hard reset
- Unified some emuopts code, and removed ifdefs
This commit is contained in:
Miodrag Milanovic 2010-11-26 13:50:56 +00:00
parent c55f86f326
commit 33b47edf95
5 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/devimage.c
View File

@ -528,6 +528,7 @@ void legacy_image_device_base::clear()
m_year.reset();
m_playable.reset();
m_extrainfo.reset();
m_basename.reset();
m_basename_noext.reset();
m_filetype.reset();

6
src/emu/emuopts.c
View File

@ -28,18 +28,12 @@ const options_entry mame_core_options[] =
/* config options */
{ NULL, NULL, OPTION_HEADER, "CORE CONFIGURATION OPTIONS" },
{ "readconfig;rc", "1", OPTION_BOOLEAN, "enable loading of configuration files" },
#ifdef MESS
{ "writeconfig;wc", "1", OPTION_BOOLEAN, "writes configuration to (driver).ini on exit" },
#else
{ "writeconfig;wc", "0", OPTION_BOOLEAN, "writes configuration to (driver).ini on exit" },
#endif /* MESS */
/* seach path options */
{ NULL, NULL, OPTION_HEADER, "CORE SEARCH PATH OPTIONS" },
{ "rompath;rp;biospath;bp", "roms", 0, "path to ROMsets and hard disk images" },
#ifdef MESS
{ "hashpath;hash_directory;hash","hash", 0, "path to hash files" },
#endif /* MESS */
{ "samplepath;sp", "samples", 0, "path to samplesets" },
{ "artpath;artwork_directory", "artwork", 0, "path to artwork files" },
{ "ctrlrpath;ctrlr_directory", "ctrlr", 0, "path to controller definitions" },

2
src/emu/emuopts.h
View File

@ -43,9 +43,7 @@
/* core search path options */
#define OPTION_ROMPATH "rompath"
#ifdef MESS
#define OPTION_HASHPATH "hashpath"
#endif
#define OPTION_SAMPLEPATH "samplepath"
#define OPTION_ARTPATH "artpath"
#define OPTION_CTRLRPATH "ctrlrpath"

7
src/emu/fileio.h
View File

@ -28,13 +28,8 @@
#define SEARCHPATH_DEBUGLOG NULL
#define SEARCHPATH_ROM OPTION_ROMPATH
#ifdef MESS
#define SEARCHPATH_IMAGE NULL
#define SEARCHPATH_HASH OPTION_HASHPATH
#else
#define SEARCHPATH_IMAGE OPTION_ROMPATH
#define SEARCHPATH_HASH NULL
#endif
#define SEARCHPATH_HASH OPTION_HASHPATH
#define SEARCHPATH_SAMPLE OPTION_SAMPLEPATH
#define SEARCHPATH_ARTWORK OPTION_ARTPATH
#define SEARCHPATH_CTRLR OPTION_CTRLRPATH

10
src/emu/mame.c
View File

@ -566,6 +566,11 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
file_error filerr;
mame_file *file;
/* update game name so depending callback options could be added */
if (priority==OPTION_PRIORITY_DRIVER_INI) {
options_force_option_callback(options, OPTION_GAMENAME, name, priority);
}
/* don't parse if it has been disabled */
if (!options_get_bool(options, OPTION_READCONFIG))
return FALSE;
@ -576,11 +581,6 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
if (filerr != FILERR_NONE)
return FALSE;
/* update game name so depending callback options could be added */
if (priority==OPTION_PRIORITY_DRIVER_INI) {
options_force_option_callback(options, OPTION_GAMENAME, name, priority);
}
/* parse the file and close it */
mame_printf_verbose("Parsing %s.ini\n", name);
options_parse_ini_file(options, mame_core_file(file), priority);