summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-10-25 05:00:12 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-10-25 05:00:12 +0000
commit69c49ae7cbfe8416a75300721456ec11fb5eccd1 (patch)
treeb1a9d35094383e7e8030bf102e1b7bcc780751d3
parent0627a2a526fbc066f5b59845a8ade749e582428f (diff)
> From: Robert [mailto:pac0446@bigpond.net.au]
> Sent: Wednesday, October 14, 2009 4:58 AM > To: Aaron Giles > Subject: mame submission for mess > > Hi Aaron, > > Here is a fix (MESS svn 5957) to correct issues when a clone computer > has > less devices than the parent (example exidy and exidyd). Currently, if > you > run exidyd, the devices from exidy will be used, causing warning > messages > which cannot be got rid of. The solution is to remove the use of parent > ini > files because in truth, MESS does not really need MAME's ini heirarchy. > > (see attachemnt for dif). > > I've had this change for about 2 years privately, and no problems have > been > found.
-rw-r--r--src/emu/mame.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 8c0beaf537e..5e25e39e53a 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -1309,6 +1309,7 @@ void mame_parse_ini_files(core_options *options, const game_driver *driver)
/* if we have a valid game driver, parse game-specific INI files */
if (driver != NULL)
{
+#ifndef MESS
const game_driver *parent = driver_get_clone(driver);
const game_driver *gparent = (parent != NULL) ? driver_get_clone(parent) : NULL;
const device_config *device;
@@ -1349,6 +1350,7 @@ void mame_parse_ini_files(core_options *options, const game_driver *driver)
parse_ini_file(options, gparent->name, OPTION_PRIORITY_GPARENT_INI);
if (parent != NULL)
parse_ini_file(options, parent->name, OPTION_PRIORITY_PARENT_INI);
+#endif /* MESS */
parse_ini_file(options, driver->name, OPTION_PRIORITY_DRIVER_INI);
}
}