summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/clifront.cpp10
-rw-r--r--src/emu/info.cpp19
-rw-r--r--src/emu/ioport.cpp2
-rw-r--r--src/emu/mame.h10
-rw-r--r--src/emu/romload.cpp8
-rw-r--r--src/emu/save.cpp5
-rw-r--r--src/emu/ui/mainmenu.cpp17
-rw-r--r--src/emu/ui/menu.cpp2
-rw-r--r--src/emu/ui/simpleselgame.cpp3
-rw-r--r--src/emu/ui/ui.cpp52
-rw-r--r--src/ldplayer/ldplayer.cpp26
-rw-r--r--src/mame/mame.cpp21
-rw-r--r--src/mame/mess.cpp23
13 files changed, 43 insertions, 155 deletions
diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 0679d419099..2643fd3e5db 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -238,7 +238,7 @@ int cli_frontend::execute(int argc, char **argv)
// print them out
osd_printf_error("\n\"%s\" approximately matches the following\n"
- "supported %s (best match first):\n\n", m_options.system_name(),emulator_info::get_gamesnoun());
+ "supported machines (best match first):\n\n", m_options.system_name());
for (auto & matche : matches)
if (matche != -1)
osd_printf_error("%-18s%s\n", drivlist.driver(matche).name, drivlist.driver(matche).description);
@@ -1591,7 +1591,7 @@ void cli_frontend::execute_commands(const char *exename)
// showusage?
if (strcmp(m_options.command(), CLICOMMAND_SHOWUSAGE) == 0)
{
- emulator_info::printf_usage(exename, emulator_info::get_gamenoun());
+ osd_printf_info("Usage: %s [machine] [media] [software] [options]",exename);
osd_printf_info("\n\nOptions:\n%s", m_options.output_help().c_str());
return;
}
@@ -1693,8 +1693,10 @@ 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("%s\n", emulator_info::get_disclaimer());
- emulator_info::printf_usage(emulator_info::get_appname(),emulator_info::get_gamenoun());
+ 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("\n\n"
" %s -showusage for a brief list of options\n"
" %s -showconfig for a list of configuration options\n"
diff --git a/src/emu/info.cpp b/src/emu/info.cpp
index 21c98853adc..111022ae223 100644
--- a/src/emu/info.cpp
+++ b/src/emu/info.cpp
@@ -19,6 +19,9 @@
#include <ctype.h>
+#define XML_ROOT "mame"
+#define XML_TOP "machine"
+
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@@ -195,8 +198,8 @@ void info_xml_creator::output(FILE *out, bool nodevices)
// output the DTD
fprintf(m_output, "<?xml version=\"1.0\"?>\n");
std::string dtd(s_dtd_string);
- strreplace(dtd, "__XML_ROOT__", emulator_info::get_xml_root());
- strreplace(dtd, "__XML_TOP__", emulator_info::get_xml_top());
+ strreplace(dtd, "__XML_ROOT__", XML_ROOT);
+ strreplace(dtd, "__XML_TOP__", XML_TOP);
fprintf(m_output, "%s\n\n", dtd.c_str());
@@ -208,7 +211,7 @@ void info_xml_creator::output(FILE *out, bool nodevices)
"no"
#endif
"\" mameconfig=\"%d\">\n",
- emulator_info::get_xml_root(),
+ XML_ROOT,
xml_normalize_string(build_version),
CONFIG_VERSION
);
@@ -222,7 +225,7 @@ void info_xml_creator::output(FILE *out, bool nodevices)
output_devices();
// close the top level tag
- fprintf(m_output, "</%s>\n",emulator_info::get_xml_root());
+ fprintf(m_output, "</%s>\n",XML_ROOT);
}
@@ -247,7 +250,7 @@ void info_xml_creator::output_one()
portlist.append(*device, errors);
// print the header and the game name
- fprintf(m_output, "\t<%s",emulator_info::get_xml_top());
+ fprintf(m_output, "\t<%s",XML_TOP);
fprintf(m_output, " name=\"%s\"", xml_normalize_string(driver.name));
// strip away any path information from the source_file and output it
@@ -309,7 +312,7 @@ void info_xml_creator::output_one()
output_ramoptions();
// close the topmost tag
- fprintf(m_output, "\t</%s>\n",emulator_info::get_xml_top());
+ fprintf(m_output, "\t</%s>\n",XML_TOP);
}
@@ -341,7 +344,7 @@ void info_xml_creator::output_one_device(device_t &device, const char *devtag)
}
// start to output info
- fprintf(m_output, "\t<%s", emulator_info::get_xml_top());
+ fprintf(m_output, "\t<%s", XML_TOP);
fprintf(m_output, " name=\"%s\"", xml_normalize_string(device.shortname()));
std::string src(device.source());
strreplace(src,"../", "");
@@ -368,7 +371,7 @@ void info_xml_creator::output_one_device(device_t &device, const char *devtag)
output_adjusters(portlist);
output_images(device, devtag);
output_slots(device, devtag);
- fprintf(m_output, "\t</%s>\n", emulator_info::get_xml_top());
+ fprintf(m_output, "\t</%s>\n", XML_TOP);
}
diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp
index 17e11748df1..a898a10051b 100644
--- a/src/emu/ioport.cpp
+++ b/src/emu/ioport.cpp
@@ -3424,7 +3424,7 @@ time_t ioport_manager::playback_init()
// verify the header against the current game
if (memcmp(machine().system().name, header + 0x14, strlen(machine().system().name) + 1) != 0)
- osd_printf_info("Input file is for %s '%s', not for current %s '%s'\n", emulator_info::get_gamenoun(), header + 0x14, emulator_info::get_gamenoun(), machine().system().name);
+ osd_printf_info("Input file is for machine '%s', not for current machine '%s'\n", header + 0x14, machine().system().name);
// enable compression
m_playback_file.compress(FCOMPRESS_MEDIUM);
diff --git a/src/emu/mame.h b/src/emu/mame.h
index fb490f80859..bc21d805716 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -55,18 +55,8 @@ public:
static const char * get_appname();
static const char * get_appname_lower();
static const char * get_configname();
- static const char * get_capgamenoun();
- static const char * get_capstartgamenoun();
- static const char * get_gamenoun();
- static const char * get_gamesnoun();
static const char * get_copyright();
static const char * get_copyright_info();
- static const char * get_disclaimer();
- static const char * get_usage();
- static const char * get_xml_root();
- static const char * get_xml_top();
- static const char * get_state_magic_num();
- static void printf_usage(const char *par1, const char *par2);
};
class lua_engine;
diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp
index e33df543fbb..886093edf13 100644
--- a/src/emu/romload.cpp
+++ b/src/emu/romload.cpp
@@ -464,7 +464,7 @@ void rom_load_manager::display_loading_rom_message(const char *name, bool from_l
char buffer[200];
if (name != nullptr)
- sprintf(buffer, "Loading %s (%d%%)", from_list ? "Software" : emulator_info::get_capstartgamenoun(), (UINT32)(100 * (UINT64)m_romsloadedsize / (UINT64)m_romstotalsize));
+ sprintf(buffer, "%s (%d%%)", from_list ? "Loading Software" : "Loading Machine", (UINT32)(100 * (UINT64)m_romsloadedsize / (UINT64)m_romstotalsize));
else
sprintf(buffer, "Loading Complete");
@@ -488,15 +488,13 @@ void rom_load_manager::display_rom_load_results(bool from_list)
{
/* create the error message and exit fatally */
osd_printf_error("%s", m_errorstring.c_str());
- fatalerror_exitcode(machine(), MAMERR_MISSING_FILES, "Required files are missing, the %s cannot be run.",emulator_info::get_gamenoun());
+ fatalerror_exitcode(machine(), MAMERR_MISSING_FILES, "Required files are missing, the machine cannot be run.");
}
/* if we had warnings, output them, but continue */
if ((m_warnings) || (m_knownbad))
{
- m_errorstring.append("WARNING: the ");
- m_errorstring.append(emulator_info::get_gamenoun());
- m_errorstring.append(" might not run correctly.");
+ m_errorstring.append("WARNING: the machine might not run correctly.");
osd_printf_warning("%s\n", m_errorstring.c_str());
}
}
diff --git a/src/emu/save.cpp b/src/emu/save.cpp
index 4a5b3ef7ebf..89197ab224e 100644
--- a/src/emu/save.cpp
+++ b/src/emu/save.cpp
@@ -49,6 +49,7 @@ enum
SS_MSB_FIRST = 0x02
};
+#define STATE_MAGIC_NUM "MAMESAVE"
//**************************************************************************
// INITIALIZATION
@@ -292,7 +293,7 @@ save_error save_manager::write_file(emu_file &file)
// generate the header
UINT8 header[HEADER_SIZE];
- memcpy(&header[0], emulator_info::get_state_magic_num(), 8);
+ memcpy(&header[0], STATE_MAGIC_NUM, 8);
header[8] = SAVE_VERSION;
header[9] = NATIVE_ENDIAN_VALUE_LE_BE(0, SS_MSB_FIRST);
strncpy((char *)&header[0x0a], machine().system().name, 0x1c - 0x0a);
@@ -365,7 +366,7 @@ save_error save_manager::validate_header(const UINT8 *header, const char *gamena
void (CLIB_DECL *errormsg)(const char *fmt, ...), const char *error_prefix)
{
// check magic number
- if (memcmp(header, emulator_info::get_state_magic_num(), 8))
+ if (memcmp(header, STATE_MAGIC_NUM, 8))
{
if (errormsg != nullptr)
(*errormsg)("%sThis is not a %s save file", error_prefix,emulator_info::get_appname());
diff --git a/src/emu/ui/mainmenu.cpp b/src/emu/ui/mainmenu.cpp
index b65500f70f5..caf531c41ef 100644
--- a/src/emu/ui/mainmenu.cpp
+++ b/src/emu/ui/mainmenu.cpp
@@ -49,13 +49,10 @@ ui_menu_main::ui_menu_main(running_machine &machine, render_container *container
void ui_menu_main::populate()
{
- std::string menu_text;
-
/* add input menu items */
item_append(_("Input (general)"), nullptr, 0, (void *)INPUT_GROUPS);
- strprintf(menu_text, _("Input (this %s)"), emulator_info::get_capstartgamenoun());
- item_append(menu_text.c_str(), nullptr, 0, (void *)INPUT_SPECIFIC);
+ item_append(_("Input (this Machine)"), nullptr, 0, (void *)INPUT_SPECIFIC);
/* add optional input-related menus */
if (machine().ioport().has_analog())
@@ -64,16 +61,14 @@ void ui_menu_main::populate()
item_append(_("Dip Switches"), nullptr, 0, (void *)SETTINGS_DIP_SWITCHES);
if (machine().ioport().has_configs())
{
- strprintf(menu_text, _("%s Configuration"), emulator_info::get_capstartgamenoun());
- item_append(menu_text.c_str(), nullptr, 0, (void *)SETTINGS_DRIVER_CONFIG);
+ item_append(_("Machine Configuration"), nullptr, 0, (void *)SETTINGS_DRIVER_CONFIG);
}
/* add bookkeeping menu */
item_append(_("Bookkeeping Info"), nullptr, 0, (void *)BOOKKEEPING);
/* add game info menu */
- strprintf(menu_text, _("%s Information"), emulator_info::get_capstartgamenoun());
- item_append(menu_text.c_str(), nullptr, 0, (void *)GAME_INFO);
+ item_append(_("Machine Information"), nullptr, 0, (void *)GAME_INFO);
image_interface_iterator imgiter(machine().root_device());
if (imgiter.first() != nullptr)
@@ -150,12 +145,10 @@ void ui_menu_main::populate()
item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
-// menu_text.assign(_("Quit from ")).append(emulator_info::get_capstartgamenoun());
-// item_append(menu_text.c_str(), nullptr, 0, (void *)QUIT_GAME);
+// item_append(_("Quit from Machine"), nullptr, 0, (void *)QUIT_GAME);
/* add reset and exit menus */
- strprintf(menu_text, _("Select New %s"), emulator_info::get_capstartgamenoun());
- item_append(menu_text.c_str(), nullptr, 0, (void *)SELECT_GAME);
+ item_append(_("Select New Machine"), nullptr, 0, (void *)SELECT_GAME);
}
ui_menu_main::~ui_menu_main()
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp
index c8177298025..547030298bb 100644
--- a/src/emu/ui/menu.cpp
+++ b/src/emu/ui/menu.cpp
@@ -249,7 +249,7 @@ void ui_menu::reset(ui_menu_reset_options options)
visitems = 0;
selected = 0;
std::string backtext;
- strprintf(backtext, "Return to %s", emulator_info::get_capstartgamenoun());
+ strprintf(backtext, "Return to Machine");
// add an item to return
if (parent == nullptr)
diff --git a/src/emu/ui/simpleselgame.cpp b/src/emu/ui/simpleselgame.cpp
index c8b1673b380..a0cf9412f6b 100644
--- a/src/emu/ui/simpleselgame.cpp
+++ b/src/emu/ui/simpleselgame.cpp
@@ -231,10 +231,9 @@ void ui_simple_menu_select_game::populate()
if (matchcount == 0)
{
std::string txt;
- strprintf(txt, "No %s found. Please check the rompath specified in the %s.ini file.\n\n"
+ strprintf(txt, "No machines found. Please check the rompath specified in the %s.ini file.\n\n"
"If this is your first time using %s, please see the config.txt file in "
"the docs directory for information on configuring %s.",
- emulator_info::get_gamesnoun(),
emulator_info::get_configname(),
emulator_info::get_appname(),emulator_info::get_appname() );
item_append(txt.c_str(), nullptr, MENU_FLAG_MULTILINE | MENU_FLAG_REDTEXT, nullptr);
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 953882f8b07..b002560382c 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -1096,11 +1096,7 @@ std::string &ui_manager::warnings_string(std::string &str)
// add a warning if any ROMs were loaded with warnings
if (machine().rom_load().warnings() > 0)
{
- str.append("One or more ROMs/CHDs for this ");
- str.append(emulator_info::get_gamenoun());
- str.append(" are incorrect. The ");
- str.append(emulator_info::get_gamenoun());
- str.append(" may not run correctly.\n");
+ str.append("One or more ROMs/CHDs for this machine are incorrect. The machine may not run correctly.\n");
if (machine().system().flags & WARNING_FLAGS)
str.append("\n");
}
@@ -1113,15 +1109,11 @@ std::string &ui_manager::warnings_string(std::string &str)
// if we have at least one warning flag, print the general header
if ((machine().system().flags & WARNING_FLAGS) || machine().rom_load().knownbad() > 0)
{
- str.append("There are known problems with this ");
- str.append(emulator_info::get_gamenoun());
- str.append("\n\n");
+ str.append("There are known problems with this machine\n\n");
// add a warning if any ROMs are flagged BAD_DUMP/NO_DUMP
if (machine().rom_load().knownbad() > 0) {
- str.append("One or more ROMs/CHDs for this ");
- str.append(emulator_info::get_gamenoun());
- str.append(" have not been correctly dumped.\n");
+ str.append("One or more ROMs/CHDs for this machine have not been correctly dumped.\n");
}
// add one line per warning flag
if (machine().system().flags & MACHINE_IMPERFECT_KEYBOARD)
@@ -1135,32 +1127,24 @@ std::string &ui_manager::warnings_string(std::string &str)
if (machine().system().flags & MACHINE_IMPERFECT_SOUND)
str.append("The sound emulation isn't 100% accurate.\n");
if (machine().system().flags & MACHINE_NO_SOUND) {
- str.append("The ");
- str.append(emulator_info::get_gamenoun());
- str.append(" lacks sound.\n");
+ str.append("The machine lacks sound.\n");
}
if (machine().system().flags & MACHINE_NO_COCKTAIL)
str.append("Screen flipping in cocktail mode is not supported.\n");
// check if external artwork is present before displaying this warning?
if (machine().system().flags & MACHINE_REQUIRES_ARTWORK) {
- str.append("The ");
- str.append(emulator_info::get_gamenoun());
- str.append(" requires external artwork files\n");
+ str.append("The machine requires external artwork files\n");
}
if (machine().system().flags & MACHINE_IS_INCOMPLETE )
{
- str.append("This ");
- str.append(emulator_info::get_gamenoun());
- str.append(" was never completed. It may exhibit strange behavior or missing elements that are not bugs in the emulation.\n");
+ str.append("This machine was never completed. It may exhibit strange behavior or missing elements that are not bugs in the emulation.\n");
}
if (machine().system().flags & MACHINE_NO_SOUND_HW )
{
- str.append("This ");
- str.append(emulator_info::get_gamenoun());
- str.append(" has no sound hardware, MAME will produce no sounds, this is expected behaviour.\n");
+ str.append("This machine has no sound hardware, MAME will produce no sounds, this is expected behaviour.\n");
}
// if there's a NOT WORKING, UNEMULATED PROTECTION or GAME MECHANICAL warning, make it stronger
@@ -1168,25 +1152,15 @@ std::string &ui_manager::warnings_string(std::string &str)
{
// add the strings for these warnings
if (machine().system().flags & MACHINE_UNEMULATED_PROTECTION) {
- str.append("The ");
- str.append(emulator_info::get_gamenoun());
- str.append(" has protection which isn't fully emulated.\n");
+ str.append("The machine has protection which isn't fully emulated.\n");
}
if (machine().system().flags & MACHINE_NOT_WORKING) {
- str.append("\nTHIS ");
- str.append(emulator_info::get_capgamenoun());
- str.append(" DOESN'T WORK. The emulation for this ");
- str.append(emulator_info::get_gamenoun());
- str.append(" is not yet complete. "
+ str.append("\nTHIS MACHINE DOESN'T WORK. The emulation for this machine is not yet complete. "
"There is nothing you can do to fix this problem except wait for the developers to improve the emulation.\n");
}
if (machine().system().flags & MACHINE_MECHANICAL) {
- str.append("\nCertain elements of this ");
- str.append(emulator_info::get_gamenoun());
- str.append(" cannot be emulated as it requires actual physical interaction or consists of mechanical devices. "
- "It is not possible to fully play this ");
- str.append(emulator_info::get_gamenoun());
- str.append(".\n");
+ str.append("\nCertain elements of this machine cannot be emulated as it requires actual physical interaction or consists of mechanical devices. "
+ "It is not possible to fully play this machine.\n");
}
// find the parent of this driver
@@ -1204,9 +1178,7 @@ std::string &ui_manager::warnings_string(std::string &str)
{
// this one works, add a header and display the name of the clone
if (!foundworking) {
- str.append("\n\nThere are working clones of this ");
- str.append(emulator_info::get_gamenoun());
- str.append(": ");
+ str.append("\n\nThere are working clones of this machine: ");
}
else
str.append(", ");
diff --git a/src/ldplayer/ldplayer.cpp b/src/ldplayer/ldplayer.cpp
index bbd309dd0b9..4f16ba130b8 100644
--- a/src/ldplayer/ldplayer.cpp
+++ b/src/ldplayer/ldplayer.cpp
@@ -22,40 +22,14 @@
#define APPNAME "MAME"
#define APPNAME_LOWER "mame"
#define CONFIGNAME "mame"
-#define CAPGAMENOUN "GAME"
-#define CAPSTARTGAMENOUN "Game"
-#define GAMENOUN "game"
-#define GAMESNOUN "games"
#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" \
- "several arcade machines. But hardware is useless without software, so an image\n" \
- "of the ROMs which run on that hardware is required. Such ROMs, like any other\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] [options]"
-#define XML_ROOT "mame"
-#define XML_TOP "game"
-#define STATE_MAGIC_NUM "MAMESAVE"
const char * emulator_info::get_appname() { return APPNAME;}
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_capgamenoun() { return CAPGAMENOUN;}
-const char * emulator_info::get_capstartgamenoun() { return CAPSTARTGAMENOUN;}
-const char * emulator_info::get_gamenoun() { return GAMENOUN;}
-const char * emulator_info::get_gamesnoun() { return GAMESNOUN;}
const char * emulator_info::get_copyright() { return COPYRIGHT;}
const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
-const char * emulator_info::get_disclaimer() { return DISCLAIMER;}
-const char * emulator_info::get_usage() { return USAGE;}
-const char * emulator_info::get_xml_root() { return XML_ROOT;}
-const char * emulator_info::get_xml_top() { return XML_TOP;}
-const char * emulator_info::get_state_magic_num() { return STATE_MAGIC_NUM;}
-void emulator_info::printf_usage(const char *par1, const char *par2) { osd_printf_info(USAGE, par1, par2); }
/*************************************
*
diff --git a/src/mame/mame.cpp b/src/mame/mame.cpp
index 1acc02060ab..9dc8d96c382 100644
--- a/src/mame/mame.cpp
+++ b/src/mame/mame.cpp
@@ -13,32 +13,11 @@
#define APPNAME "MAME"
#define APPNAME_LOWER "mame"
#define CONFIGNAME "mame"
-#define CAPGAMENOUN "MACHINE"
-#define CAPSTARTGAMENOUN "Machine"
-#define GAMENOUN "machine"
-#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 "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"
-#define USAGE "Usage: %s [%s] [media] [software] [options]"
-#define XML_ROOT "mame"
-#define XML_TOP "machine"
-#define STATE_MAGIC_NUM "MAMESAVE"
const char * emulator_info::get_appname() { return APPNAME;}
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_capgamenoun() { return CAPGAMENOUN;}
-const char * emulator_info::get_capstartgamenoun() { return CAPSTARTGAMENOUN;}
-const char * emulator_info::get_gamenoun() { return GAMENOUN;}
-const char * emulator_info::get_gamesnoun() { return GAMESNOUN;}
const char * emulator_info::get_copyright() { return COPYRIGHT;}
const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
-const char * emulator_info::get_disclaimer() { return DISCLAIMER;}
-const char * emulator_info::get_usage() { return USAGE;}
-const char * emulator_info::get_xml_root() { return XML_ROOT;}
-const char * emulator_info::get_xml_top() { return XML_TOP;}
-const char * emulator_info::get_state_magic_num() { return STATE_MAGIC_NUM;}
-void emulator_info::printf_usage(const char *par1, const char *par2) { osd_printf_info(USAGE, par1, par2); }
diff --git a/src/mame/mess.cpp b/src/mame/mess.cpp
index 985aeaa19e7..209ff7651d6 100644
--- a/src/mame/mess.cpp
+++ b/src/mame/mess.cpp
@@ -13,32 +13,9 @@
#define APPNAME "MESS"
#define APPNAME_LOWER "mess"
#define CONFIGNAME "mess"
-#define CAPGAMENOUN "MACHINE"
-#define CAPSTARTGAMENOUN "Machine"
-#define GAMENOUN "machine"
-#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 "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"
-#define USAGE "Usage: %s [%s] [media] [software] [options]"
-#define XML_ROOT "mame"
-#define XML_TOP "machine"
-#define STATE_MAGIC_NUM "MAMESAVE"
const char * emulator_info::get_appname() { return APPNAME;}
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_capgamenoun() { return CAPGAMENOUN;}
-const char * emulator_info::get_capstartgamenoun() { return CAPSTARTGAMENOUN;}
-const char * emulator_info::get_gamenoun() { return GAMENOUN;}
-const char * emulator_info::get_gamesnoun() { return GAMESNOUN;}
-const char * emulator_info::get_copyright() { return COPYRIGHT;}
-const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
-const char * emulator_info::get_disclaimer() { return DISCLAIMER;}
-const char * emulator_info::get_usage() { return USAGE;}
-const char * emulator_info::get_xml_root() { return XML_ROOT;}
-const char * emulator_info::get_xml_top() { return XML_TOP;}
-const char * emulator_info::get_state_magic_num() { return STATE_MAGIC_NUM;}
-void emulator_info::printf_usage(const char *par1, const char *par2) { osd_printf_info(USAGE, par1, par2); }