From 1e310bd682fd71c159d79011d0e6af0241e51478 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 8 Feb 2021 00:17:01 +0100 Subject: [PATCH] Added a GAMEENGINE prefix to the PlatformId enumerators for the game engine systems. --- es-app/src/PlatformId.cpp | 2 +- es-app/src/PlatformId.h | 20 ++++++++++---------- es-app/src/scrapers/ScreenScraper.cpp | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 21559d640..f4155e904 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -17,7 +17,7 @@ namespace PlatformIds "unknown", // Nothing set. "3do", // 3DO - "ags", // Adventure Game Studio + "ags", // Adventure Game Studio game engine "amiga", // Commodore Amiga "amigacd32", // Commodore Amiga CD32 "amstradcpc", // Amstrad CPC diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 3023ab8e9..fcdb753a2 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -17,7 +17,7 @@ namespace PlatformIds PLATFORM_UNKNOWN = 0, THREEDO, // Names can't start with a number. - ADVENTUREGAMESTUDIO, + GAMEENGINE_ADVENTUREGAMESTUDIO, COMMODORE_AMIGA, COMMODORE_AMIGA_CD32, AMSTRAD_CPC, @@ -57,8 +57,8 @@ namespace PlatformIds SEGA_GENESIS, AMSTRAD_GX4000, INTELLIVISION, - LOVE, - LUTRO, + GAMEENGINE_LOVE, + GAMEENGINE_LUTRO, APPLE_MACINTOSH, SEGA_MASTER_SYSTEM, SEGA_MEGA_DRIVE, @@ -78,7 +78,7 @@ namespace PlatformIds SNK_NEO_GEO_POCKET, SNK_NEO_GEO_POCKET_COLOR, VIDEOPAC_ODYSSEY2, - OPENBOR, + GAMEENGINE_OPENBOR, TANGERINE_ORIC, PALM_OS, PC, @@ -94,22 +94,22 @@ namespace PlatformIds SONY_PLAYSTATION_PORTABLE, SONY_PLAYSTATION_VITA, SONY_PLAYSTATION, - RESIDUALVM, + GAMEENGINE_RESIDUALVM, SAMCOUPE, NINTENDO_SATELLAVIEW, SEGA_SATURN, - SCUMMVM, + GAMEENGINE_SCUMMVM, SEGA_32X, SEGA_CD, SEGA_SG1000, SUPER_NINTENDO, - SOLARUS, + GAMEENGINE_SOLARUS, SPECTRAVIDEO, - STRATAGUS, + GAMEENGINE_STRATAGUS, BANDAI_SUFAMI_TURBO, NEC_SUPERGRAFX, TEXAS_INSTRUMENTS_TI99, - TIC80, + GAMEENGINE_TIC80, TANDY_TRS80, UZEBOX, VECTREX, @@ -123,7 +123,7 @@ namespace PlatformIds SHARP_X68000, MICROSOFT_XBOX, MICROSOFT_XBOX_360, - SINCLAIR_Z_MACHINE, + GAMEENGINE_Z_MACHINE, SINCLAIR_ZX81_SINCLAR, SINCLAIR_ZX_SPECTRUM, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index d43d356cc..2570ea5e4 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -52,7 +52,7 @@ const std::map screenscraper_platformid_map { { COMMODORE_CDTV, 129 }, { DAPHNE, 49 }, { INTELLIVISION, 115 }, - { LUTRO, 206 }, + { GAMEENGINE_LUTRO, 206 }, { APPLE_MACINTOSH, 146 }, { MICROSOFT_XBOX, 32 }, { MICROSOFT_XBOX_360, 33 }, @@ -84,9 +84,9 @@ const std::map screenscraper_platformid_map { { DOS, 135 }, { PC, 135 }, { NEC_PCFX, 72 }, - { OPENBOR, 214 }, + { GAMEENGINE_OPENBOR, 214 }, { TANGERINE_ORIC, 131 }, - { SCUMMVM, 123}, + { GAMEENGINE_SCUMMVM, 123}, { SEGA_32X, 19 }, { SEGA_CD, 20 }, { SEGA_DREAMCAST, 23 }, @@ -98,7 +98,7 @@ const std::map screenscraper_platformid_map { { SEGA_SG1000, 109 }, { SHARP_X1, 220}, { SHARP_X68000, 79}, - { SOLARUS, 223 }, + { GAMEENGINE_SOLARUS, 223 }, { SONY_PLAYSTATION, 57 }, { SONY_PLAYSTATION_2, 58 }, { SONY_PLAYSTATION_3, 59 }, @@ -107,7 +107,7 @@ const std::map screenscraper_platformid_map { { SAMCOUPE, 213 }, { SUPER_NINTENDO, 4 }, { NEC_SUPERGRAFX, 105 }, - { TIC80, 222 }, + { GAMEENGINE_TIC80, 222 }, { NEC_PC_8800, 221}, { NEC_PC_9800, 208}, { NEC_PC_ENGINE, 31 },