diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index d833c32d5ae..c537ce6dc4e 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -421,13 +421,13 @@ void emu_options::parse_standard_inis(std::string &error_string) parse_one_ini("horizont", OPTION_PRIORITY_ORIENTATION_INI, &error_string); if (cursystem->flags & GAME_TYPE_ARCADE) - parse_one_ini(GAME_TYPE_STRING_ARCADE, OPTION_PRIORITY_SYSTYPE_INI, &error_string); + parse_one_ini("arcade", OPTION_PRIORITY_SYSTYPE_INI, &error_string); else if (cursystem->flags & GAME_TYPE_CONSOLE) - parse_one_ini(GAME_TYPE_STRING_CONSOLE, OPTION_PRIORITY_SYSTYPE_INI, &error_string); + parse_one_ini("console", OPTION_PRIORITY_SYSTYPE_INI, &error_string); else if (cursystem->flags & GAME_TYPE_COMPUTER) - parse_one_ini(GAME_TYPE_STRING_COMPUTER, OPTION_PRIORITY_SYSTYPE_INI, &error_string); + parse_one_ini("computer", OPTION_PRIORITY_SYSTYPE_INI, &error_string); else if (cursystem->flags & GAME_TYPE_OTHER) - parse_one_ini(GAME_TYPE_STRING_OTHER, OPTION_PRIORITY_SYSTYPE_INI, &error_string); + parse_one_ini("othersys", OPTION_PRIORITY_SYSTYPE_INI, &error_string); // parse "vector.ini" for vector games { diff --git a/src/emu/gamedrv.h b/src/emu/gamedrv.h index 9299749325f..36263aec1e1 100644 --- a/src/emu/gamedrv.h +++ b/src/emu/gamedrv.h @@ -49,11 +49,7 @@ const UINT32 GAME_CLICKABLE_ARTWORK = 0x00800000; // marking that artw const UINT32 GAME_IS_SKELETON = GAME_NO_SOUND | GAME_NOT_WORKING; // mask for skelly games const UINT32 GAME_IS_SKELETON_MECHANICAL = GAME_IS_SKELETON | GAME_MECHANICAL | GAME_REQUIRES_ARTWORK; // mask for skelly mechanical games -// machine type string -#define GAME_TYPE_STRING_ARCADE "arcade" -#define GAME_TYPE_STRING_CONSOLE "console" -#define GAME_TYPE_STRING_COMPUTER "computer" -#define GAME_TYPE_STRING_OTHER "othersys" + //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/info.c b/src/emu/info.c index a7e657782fd..4b5adfab3b1 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -39,7 +39,6 @@ const char info_xml_creator::s_dtd_string[] = "\t\t\n" "\t\t\n" "\t\t\n" -"\t\t\n" "\t\t\n" "\t\t\n" "\t\t\n" @@ -274,15 +273,6 @@ void info_xml_creator::output_one() // display sample information and close the game tag output_sampleof(); - // machine type indicator - if (driver.flags & GAME_TYPE_ARCADE) - fprintf(m_output, " type=\"%s\"", GAME_TYPE_STRING_ARCADE); - else if (driver.flags & GAME_TYPE_CONSOLE) - fprintf(m_output, " type=\"%s\"", GAME_TYPE_STRING_CONSOLE); - else if (driver.flags & GAME_TYPE_COMPUTER) - fprintf(m_output, " type=\"%s\"", GAME_TYPE_STRING_COMPUTER); - else if (driver.flags & GAME_TYPE_OTHER) - fprintf(m_output, " type=\"%s\"", GAME_TYPE_STRING_OTHER); fprintf(m_output, ">\n"); // output game description