diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/main.h | 20 | ||||
-rw-r--r-- | src/frontend/mame/clifront.cpp | 33 |
2 files changed, 31 insertions, 22 deletions
diff --git a/src/emu/main.h b/src/emu/main.h index 71d7b951e4d..609985a48bf 100644 --- a/src/emu/main.h +++ b/src/emu/main.h @@ -43,16 +43,16 @@ class emulator_info { public: // construction/destruction - emulator_info() {}; - - static const char * get_appname(); - static const char * get_appname_lower(); - static const char * get_configname(); - static const char * get_copyright(); - static const char * get_copyright_info(); - static const char * get_bare_build_version(); - static const char * get_build_version(); - static void display_ui_chooser(running_machine& machine); + emulator_info() = default; + + static const char *get_appname(); + static const char *get_appname_lower(); + static const char *get_configname(); + static const char *get_copyright(); + static const char *get_copyright_info(); + static const char *get_bare_build_version(); + static const char *get_build_version(); + static void display_ui_chooser(running_machine &machine); static int start_frontend(emu_options &options, osd_interface &osd, std::vector<std::string> &args); static int start_frontend(emu_options &options, osd_interface &osd, int argc, char *argv[]); static void draw_user_interface(running_machine& machine); diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp index 9a15314eebc..de22e2e9113 100644 --- a/src/frontend/mame/clifront.cpp +++ b/src/frontend/mame/clifront.cpp @@ -1729,16 +1729,25 @@ void cli_frontend::execute_commands(const char *exename) void cli_frontend::display_help(const char *exename) { - 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]",exename); - osd_printf_info("\n\n" - " %s -showusage for a list of options\n" - " %s -showconfig to show your current %s.ini\n" - " %s -listmedia for a full list of supported media\n" - " %s -createconfig to create a %s.ini\n\n" - "For usage instructions, please visit https://docs.mamedev.org \n",exename, - exename,emulator_info::get_configname(),exename,exename,emulator_info::get_configname()); + osd_printf_info( + "%3$s v%2$s\n" + "%5$s\n" + "\n" + "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" + "Usage: %1$s [machine] [media] [software] [options]\n" + "\n" + " %1$s -showusage for a list of options\n" + " %1$s -showconfig to show current configuration in %4$s.ini format\n" + " %1$s -listmedia for a full list of supported media\n" + " %1$s -createconfig to create a %4$s.ini file\n" + "\n" + "For usage instructions, please visit https://docs.mamedev.org/\n", + exename, + build_version, + emulator_info::get_appname(), + emulator_info::get_configname(), + emulator_info::get_copyright_info()); } |