Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-19 03:59:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed order of parsing parameters, this way game name is checked first, so in case of optional parameters (like for image devices) it will first give you list of drivers with nearest name and not error that parameter doesn't exist (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2011-01-18 15:38:10 +00:00
parent ae6835391a
commit d1d0edef59
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/emu/clifront.c
View File

@ -127,30 +127,20 @@ 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);
/* parse the command line first; if we fail here, we're screwed */
if (options_parse_command_line(options, argc, argv, OPTION_PRIORITY_CMDLINE))
gamename_option = "";
for (int arg = 1; arg < argc; arg++)
{
result = MAMERR_INVALID_CONFIG;
goto error;
if ((argv[arg][0] != '-')) {
gamename_option = argv[arg];
break;
}
}
/* 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)
{
@ -172,6 +162,24 @@ 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);
}