diff options
Diffstat (limited to 'src/emu/clifront.cpp')
-rw-r--r-- | src/emu/clifront.cpp | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp index 2643fd3e5db..05b0ace6116 100644 --- a/src/emu/clifront.cpp +++ b/src/emu/clifront.cpp @@ -27,8 +27,6 @@ #include "osdepend.h" #include "softlist.h" -#include "ui/moptions.h" - #include <new> #include <ctype.h> @@ -99,8 +97,6 @@ int cli_frontend::execute(int argc, char **argv) { // wrap the core execution in a try/catch to field all fatal errors m_result = MAMERR_NONE; - machine_manager *manager = machine_manager::instance(m_options, m_osd); - try { // first parse options to be able to get software from it @@ -108,8 +104,6 @@ int cli_frontend::execute(int argc, char **argv) m_options.parse_command_line(argc, argv, option_errors); m_options.parse_standard_inis(option_errors); - - manager->start_luaengine(); if (*(m_options.software_name()) != 0) { @@ -154,7 +148,7 @@ int cli_frontend::execute(int argc, char **argv) strprintf(val, "%s:%s:%s", swlistdev->list_name(), m_options.software_name(), swpart->name()); // call this in order to set slot devices according to mounting - m_options.parse_slot_devices(argc, argv, option_errors, image->instance_name(), val.c_str(), swpart); + m_options.parse_slot_devices(argc, argv, option_errors, image->instance_name(), val.c_str()); break; } } @@ -215,7 +209,9 @@ int cli_frontend::execute(int argc, char **argv) throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "Unknown system '%s'", m_options.system_name()); // otherwise just run the game + machine_manager *manager = machine_manager::instance(m_options, m_osd); m_result = manager->execute(); + global_free(manager); } } @@ -238,7 +234,7 @@ int cli_frontend::execute(int argc, char **argv) // print them out osd_printf_error("\n\"%s\" approximately matches the following\n" - "supported machines (best match first):\n\n", m_options.system_name()); + "supported %s (best match first):\n\n", m_options.system_name(),emulator_info::get_gamesnoun()); for (auto & matche : matches) if (matche != -1) osd_printf_error("%-18s%s\n", drivlist.driver(matche).name, drivlist.driver(matche).description); @@ -266,7 +262,6 @@ int cli_frontend::execute(int argc, char **argv) } _7z_file_cache_clear(); - global_free(manager); return m_result; } @@ -1591,7 +1586,7 @@ void cli_frontend::execute_commands(const char *exename) // showusage? if (strcmp(m_options.command(), CLICOMMAND_SHOWUSAGE) == 0) { - osd_printf_info("Usage: %s [machine] [media] [software] [options]",exename); + emulator_info::printf_usage(exename, emulator_info::get_gamenoun()); osd_printf_info("\n\nOptions:\n%s", m_options.output_help().c_str()); return; } @@ -1623,14 +1618,6 @@ void cli_frontend::execute_commands(const char *exename) // generate the updated INI file.puts(m_options.output_ini().c_str()); - - ui_options ui_opts; - emu_file file_ui(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); - if (file_ui.open("ui.ini") != FILERR_NONE) - throw emu_fatalerror("Unable to create file ui.ini\n"); - - // generate the updated INI - file_ui.puts(ui_opts.output_ini().c_str()); return; } @@ -1693,10 +1680,8 @@ void cli_frontend::execute_commands(const char *exename) void cli_frontend::display_help() { osd_printf_info("%s v%s\n%s\n\n", emulator_info::get_appname(),build_version,emulator_info::get_copyright_info()); - osd_printf_info("This software reproduces, more or less faithfully, the behaviour of a wide range\n" - "of machines. But hardware is useless without software, so images of the ROMs and\n" - "other media which run on that hardware are also required.\n\n"); - osd_printf_info("Usage: %s [machine] [media] [software] [options]",emulator_info::get_appname()); + osd_printf_info("%s\n", emulator_info::get_disclaimer()); + emulator_info::printf_usage(emulator_info::get_appname(),emulator_info::get_gamenoun()); osd_printf_info("\n\n" " %s -showusage for a brief list of options\n" " %s -showconfig for a list of configuration options\n" |