Clean up command-line -h output, tidy up emulator_info class a little, add trim trailing whitespace to .editorconfig

This commit is contained in:
Vas Crabb 2020-08-14 18:35:00 +10:00
parent 303880d1b4
commit 2c505740c3
4 changed files with 32 additions and 22 deletions

View File

@ -6,6 +6,7 @@ indent_size = 4
indent_style = tab
insert_final_newline = true
tab_width = 4
trim_trailing_whitespace = true
[*.py]
indent_style = space

View File

@ -978,7 +978,7 @@ Titles, serial #s, publishers and release dates taken from:
<info name="alt_title" value="井上のドラスレ"/>
<part name="cass1" interface="fm7_cass">
<dataarea name="cass" size="1270216">
<rom name="inoue.t77" size="1270216" crc="571B270E" sha1="1176818E42976A04EC6800C91AC97B6F0F6FFB37"/>
<rom name="inoue.t77" size="1270216" crc="571b270e" sha1="1176818e42976a04ec6800c91ac97b6f0f6ffb37"/>
</dataarea>
</part>
</software>

View File

@ -43,16 +43,16 @@ class emulator_info
{
public:
// construction/destruction
emulator_info() {};
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 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);

View File

@ -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());
}