From a3eb6229504c7b9b724a4390b194fa97eb8ee314 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 19 Jan 2011 08:15:53 +0000 Subject: [PATCH] Revert back change r11240 of clifront.c since errors caused for romident and similar commands (no whatsnew) --- src/emu/clifront.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 9e2c58214ff..8e02a9382ea 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -127,20 +127,30 @@ int cli_execute(int argc, char **argv, osd_interface &osd, const options_entry * /* initialize the options manager and add the CLI-specific options */ options = mame_options_init(osd_options); options_add_entries(options, cli_options); - - gamename_option = ""; - for (int arg = 1; arg < argc; arg++) + + /* parse the command line first; if we fail here, we're screwed */ + if (options_parse_command_line(options, argc, argv, OPTION_PRIORITY_CMDLINE)) { - if ((argv[arg][0] != '-')) { - gamename_option = argv[arg]; - break; - } + result = MAMERR_INVALID_CONFIG; + goto error; } + /* parse the simple commmands before we go any further */ + core_filename_extract_base(&exename, argv[0], TRUE); + result = execute_simple_commands(options, exename); + if (result != -1) + goto error; + /* find out what game we might be referring to */ + gamename_option = options_get_string(options, OPTION_GAMENAME); core_filename_extract_base(&gamename, gamename_option, TRUE); driver = driver_get_name(gamename); + /* execute any commands specified */ + result = execute_commands(options, exename, driver); + if (result != -1) + goto error; + /* if we don't have a valid driver selected, offer some suggestions */ if (strlen(gamename_option) > 0 && driver == NULL) { @@ -162,24 +172,6 @@ int cli_execute(int argc, char **argv, osd_interface &osd, const options_entry * goto error; } - /* parse the command line first; if we fail here, we're screwed */ - if (options_parse_command_line(options, argc, argv, OPTION_PRIORITY_CMDLINE)) - { - result = MAMERR_INVALID_CONFIG; - goto error; - } - - /* parse the simple commmands before we go any further */ - core_filename_extract_base(&exename, argv[0], TRUE); - result = execute_simple_commands(options, exename); - if (result != -1) - goto error; - - /* execute any commands specified */ - result = execute_commands(options, exename, driver); - if (result != -1) - goto error; - /* run the game */ result = mame_execute(osd, options); }