summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/emuopts.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/emuopts.c')
-rw-r--r--src/emu/emuopts.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index c7df63d76d1..8d2e6c0e56f 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -435,17 +435,23 @@ void emu_options::parse_standard_inis(std::string &error_string)
parse_one_ini("computer", OPTION_PRIORITY_SYSTYPE_INI, &error_string);
else if (cursystem->flags & GAME_TYPE_OTHER)
parse_one_ini("othersys", OPTION_PRIORITY_SYSTYPE_INI, &error_string);
-
- // parse "vector.ini" for vector games
+
+ machine_config config(*cursystem, *this);
+ screen_device_iterator iter(config.root_device());
+ for (const screen_device *device = iter.first(); device != NULL; device = iter.next())
{
- machine_config config(*cursystem, *this);
- screen_device_iterator iter(config.root_device());
- for (const screen_device *device = iter.first(); device != NULL; device = iter.next())
- if (device->screen_type() == SCREEN_TYPE_VECTOR)
- {
- parse_one_ini("vector", OPTION_PRIORITY_VECTOR_INI, &error_string);
- break;
- }
+ // parse "raster.ini" for raster games
+ if (device->screen_type() == SCREEN_TYPE_RASTER)
+ {
+ parse_one_ini("raster", OPTION_PRIORITY_SCREEN_INI, &error_string);
+ break;
+ }
+ // parse "vector.ini" for vector games
+ if (device->screen_type() == SCREEN_TYPE_VECTOR)
+ {
+ parse_one_ini("vector", OPTION_PRIORITY_SCREEN_INI, &error_string);
+ break;
+ }
}
// next parse "source/<sourcefile>.ini"; if that doesn't exist, try <sourcefile>.ini