Usage text changes, part 1 (nw)

src/emu/machine.c

@@ -365,7 +365,7 @@ int running_machine::run(bool firstrun)
 		ui().initialize(*this);
 
 		// display the startup screens
-		ui().display_startup_screens(firstrun, !settingsloaded);
+		ui().display_startup_screens(firstrun, false);
 
 		// perform a soft reset -- this takes us to the running phase
 		soft_reset();

src/mame/etc/template_driver.c

@@ -168,7 +168,7 @@ MACHINE_CONFIG_END
 
 /***************************************************************************
 
-  Game driver(s)
+  Machine driver(s)
 
 ***************************************************************************/
 
@@ -177,4 +177,17 @@ ROM_START( xxx )
 	ROM_REGION( 0x10000, "gfx1", ROMREGION_ERASE00 )
 ROM_END
 
-GAME( 198?, xxx,  0,   xxx,  xxx, driver_device,  0,       ROT0, "<template_manufacturer>",      "<template_gamename>", GAME_IS_SKELETON )
+// See src/emu/gamedrv.h for details
+// For a game:
+// GAME(YEAR,NAME,PARENT,MACHINE,INPUT,CLASS,INIT,MONITOR,COMPANY,FULLNAME,FLAGS)
+
+// For a console:
+// CONS(YEAR,NAME,PARENT,COMPAT,MACHINE,INPUT,CLASS,INIT,COMPANY,FULLNAME,FLAGS)
+
+// For a computer:
+// COMP(YEAR,NAME,PARENT,COMPAT,MACHINE,INPUT,CLASS,INIT,COMPANY,FULLNAME,FLAGS)
+
+// For a generic system:
+// SYST(YEAR,NAME,PARENT,COMPAT,MACHINE,INPUT,CLASS,INIT,COMPANY,FULLNAME,FLAGS)
+
+GAME( 198?, xxx,  0,   xxx,  xxx, driver_device,  0,       ROT0, "<template_manufacturer>",      "<template_machinename>", GAME_IS_SKELETON )

src/mame/mame.c

@@ -15,23 +15,18 @@
 #define CONFIGNAME              "mame"
 #define APPLONGNAME             "M.A.M.E."
 #define FULLLONGNAME            "Multiple Arcade Machine Emulator"
-#define CAPGAMENOUN             "GAME"
+#define CAPGAMENOUN             "MACHINE"
-#define CAPSTARTGAMENOUN        "Game"
+#define CAPSTARTGAMENOUN        "Machine"
-#define GAMENOUN                "game"
+#define GAMENOUN                "machine"
-#define GAMESNOUN               "games"
+#define GAMESNOUN               "machines"
 #define COPYRIGHT               "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org"
 #define COPYRIGHT_INFO          "Copyright Nicola Salmoria and the MAME team"
-#define DISCLAIMER              "MAME is an emulator: it reproduces, more or less faithfully, the behaviour of\n" \
+#define DISCLAIMER              "This software reproduces, more or less faithfully, the behaviour of a wide range\n" \
-								"several arcade machines. But hardware is useless without software, so an image\n" \
+								"of machines. But hardware is useless without software, so images of the ROMs and\n" \
-								"of the ROMs which run on that hardware is required. Such ROMs, like any other\n" \
+								"other media which run on that hardware are also required.\n"
-								"commercial software, are copyrighted material and it is therefore illegal to\n" \
-								"use them if you don't own the original arcade machine. Needless to say, ROMs\n" \
-								"are not distributed together with MAME. Distribution of MAME together with ROM\n" \
-								"images is a violation of copyright law and should be promptly reported to the\n" \
-								"authors so that appropriate legal action can be taken.\n"
 #define USAGE                   "Usage:  %s [%s] [media] [software] [options]"
 #define XML_ROOT                "mame"
-#define XML_TOP                 "game"
+#define XML_TOP                 "machine"
 #define STATE_MAGIC_NUM         "MAMESAVE"
 
 const char * emulator_info::get_appname() { return APPNAME;}

src/mame/mess.c

@@ -15,25 +15,19 @@
 #define CONFIGNAME              "mess"
 #define APPLONGNAME             "M.E.S.S."
 #define FULLLONGNAME            "Multi Emulator Super System"
-#define CAPGAMENOUN             "SYSTEM"
+#define CAPGAMENOUN             "MACHINE"
-#define CAPSTARTGAMENOUN        "System"
+#define CAPSTARTGAMENOUN        "Machine"
-#define GAMENOUN                "system"
+#define GAMENOUN                "machine"
-#define GAMESNOUN               "systems"
+#define GAMESNOUN               "machines"
 #define COPYRIGHT               "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org"
 #define COPYRIGHT_INFO          "Copyright Nicola Salmoria and the MAME team"
-#define DISCLAIMER              "MESS is an emulator: it reproduces, more or less faithfully, the behaviour of\n"\
+#define DISCLAIMER              "This software reproduces, more or less faithfully, the behaviour of a wide range\n" \
-								"several computer and console systems. But hardware is useless without software\n" \
+								"of machines. But hardware is useless without software, so images of the ROMs and\n" \
-								"so a file dump of the ROM, cartridges, discs, and cassettes which run on that\n" \
+								"other media which run on that hardware are also required.\n"
-								"hardware is required. Such files, like any other commercial software, are\n" \
-								"copyrighted material and it is therefore illegal to use them if you don't own\n" \
-								"the original media from which the files are derived. Needless to say, these\n" \
-								"files are not distributed together with MESS. Distribution of MESS together\n" \
-								"with these files is a violation of copyright law and should be promptly\n" \
-								"reported to the authors so that appropriate legal action can be taken.\n"
 #define USAGE                   "Usage:  %s [%s] [media] [software] [options]"
-#define XML_ROOT                "mess"
+#define XML_ROOT                "mame"
 #define XML_TOP                 "machine"
-#define STATE_MAGIC_NUM         "MESSSAVE"
+#define STATE_MAGIC_NUM         "MAMESAVE"
 
 const char * emulator_info::get_appname() { return APPNAME;}
 const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}