summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2010-11-26 13:50:56 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2010-11-26 13:50:56 +0000
commit33b47edf955385af51e1ea95b3a8a00373745150 (patch)
treec0c5681ca02fdb41b05d5839db3817c25307a9be
parentc55f86f326e7c2943be5b9427ecb1556c58719a9 (diff)
- Fixed issue with image empty slot [Miodrag Milanovic]
- 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
-rw-r--r--src/emu/devimage.c1
-rw-r--r--src/emu/emuopts.c6
-rw-r--r--src/emu/emuopts.h2
-rw-r--r--src/emu/fileio.h7
-rw-r--r--src/emu/mame.c10
5 files changed, 7 insertions, 19 deletions
diff --git a/src/emu/devimage.c b/src/emu/devimage.c
index 6991fcea82a..71fa82a743f 100644
--- a/src/emu/devimage.c
+++ b/src/emu/devimage.c
@@ -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();
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index 77b188db99f..5c09df00566 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -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" },
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h
index 73011bbdc87..bfb8299af20 100644
--- a/src/emu/emuopts.h
+++ b/src/emu/emuopts.h
@@ -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"
diff --git a/src/emu/fileio.h b/src/emu/fileio.h
index b41323d3732..56840f970d1 100644
--- a/src/emu/fileio.h
+++ b/src/emu/fileio.h
@@ -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
diff --git a/src/emu/mame.c b/src/emu/mame.c
index fa98cf081b6..a1089342e5c 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -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);