Removed various differences between MESS and MAME, all is now defined in mame.h.

This should allow hopefully easier maintenance (no whatsnew)
This commit is contained in:
Miodrag Milanovic 2011-04-14 10:52:08 +00:00
parent 2972e72031
commit 2cea488188
5 changed files with 41 additions and 56 deletions

View File

@ -51,9 +51,6 @@
#include <new>
#include <ctype.h>
#ifdef MESS
#include "mess.h"
#endif
//**************************************************************************
@ -1119,11 +1116,7 @@ void cli_frontend::execute_commands(const char *exename)
if (strcmp(m_options.command(), CLICOMMAND_SHOWUSAGE) == 0)
{
astring helpstring;
#ifndef MESS
mame_printf_info("Usage: %s [%s] [options]\n\nOptions:\n%s", exename, GAMENOUN, m_options.output_help(helpstring));
#else
mame_printf_info("Usage: %s [%s] [media] [software] [options]\n\nOptions:\n%s", exename, GAMENOUN, m_options.output_help(helpstring));
#endif
mame_printf_info(USAGE "\n\nOptions:\n%s", exename, GAMENOUN, m_options.output_help(helpstring));
return;
}
@ -1208,18 +1201,14 @@ void cli_frontend::execute_commands(const char *exename)
void cli_frontend::display_help()
{
#ifndef MESS
mame_printf_info("M.A.M.E. v%s - Multiple Arcade Machine Emulator\n"
"Copyright Nicola Salmoria and the MAME Team\n\n", build_version);
mame_printf_info("%s\n", mame_disclaimer);
mame_printf_info("Usage: MAME gamename [options]\n\n"
" MAME -showusage for a brief list of options\n"
" MAME -showconfig for a list of configuration options\n"
" MAME -createconfig to create a " CONFIGNAME ".ini\n\n"
"For usage instructions, please consult the file windows.txt\n");
#else
mess_display_help();
#endif
mame_printf_info(APPLONGNAME " v%s - " FULLLONGNAME "\n"
COPYRIGHT_INFO "\n\n", build_version);
mame_printf_info("%s\n", DISCLAIMER);
mame_printf_info(USAGE "\n\n"
" " APPNAME " -showusage for a brief list of options\n"
" " APPNAME " -showconfig for a list of configuration options\n"
" " APPNAME " -createconfig to create a " CONFIGNAME ".ini\n\n"
"For usage instructions, please consult the file windows.txt\n",APPNAME,GAMENOUN);
}

View File

@ -47,18 +47,6 @@
#include <ctype.h>
// MAME vs MESS configuration
#ifdef MESS
#define XML_ROOT "mess"
#define XML_TOP "machine"
#else
#define XML_ROOT "mame"
#define XML_TOP "game"
#endif
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************

View File

@ -107,19 +107,6 @@ static running_machine *global_machine;
static output_callback_func output_cb[OUTPUT_CHANNEL_COUNT];
static void *output_cb_param[OUTPUT_CHANNEL_COUNT];
/* the "disclaimer" that should be printed when run with no parameters */
const char mame_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";
/***************************************************************************
CORE IMPLEMENTATION
***************************************************************************/

View File

@ -48,23 +48,52 @@ enum
#define APPNAME_LOWER "mame"
#define CONFIGNAME "mame"
#define APPLONGNAME "M.A.M.E."
#define FULLLONGNAME "Multiple Arcade Machine Emulator"
#define CAPGAMENOUN "GAME"
#define CAPSTARTGAMENOUN "Game"
#define GAMENOUN "game"
#define GAMESNOUN "games"
#define HISTORYNAME "History"
#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 'M', 'A', 'M', 'E', 'S', 'A', 'V', 'E'
#else
#define APPNAME "MESS"
#define APPNAME_LOWER "mess"
#define CONFIGNAME "mess"
#define APPLONGNAME "M.E.S.S."
#define FULLLONGNAME "Multi Emulator Super System"
#define CAPGAMENOUN "SYSTEM"
#define CAPSTARTGAMENOUN "System"
#define GAMENOUN "system"
#define GAMESNOUN "systems"
#define HISTORYNAME "System Info"
#define COPYRIGHT "Copyright the MESS team\nhttp://mess.org"
#define COPYRIGHT_INFO "Copyright the MESS team\n\n" \
"MESS is based on MAME Source code\n" \
"Copyright Nicola Salmoria and the MAME team"
#define DISCLAIMER "MESS is an emulator: it reproduces, more or less faithfully, the behaviour of\n"\
"several computer and console systems. But hardware is useless without software\n" \
"so a file dump of the ROM, cartridges, discs, and cassettes which run on that\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_TOP "machine"
#define STATE_MAGIC_NUM 'M', 'E', 'S', 'S', 'S', 'A', 'V', 'E'
#endif
@ -82,8 +111,6 @@ typedef void (*output_callback_func)(void *param, const char *format, va_list ar
// GLOBAL VARIABLES
//**************************************************************************
extern const char mame_disclaimer[];
extern const char build_version[];

View File

@ -85,13 +85,7 @@ enum
// GLOBAL VARIABLES
//**************************************************************************
#ifdef MESS
const char state_manager::s_magic_num[8] = { 'M', 'E', 'S', 'S', 'S', 'A', 'V', 'E' };
#else
const char state_manager::s_magic_num[8] = { 'M', 'A', 'M', 'E', 'S', 'A', 'V', 'E' };
#endif
const char state_manager::s_magic_num[8] = { STATE_MAGIC_NUM };
//**************************************************************************
// INITIALIZATION