From d418c056145f4978af1cfd03367f8c0f15036f59 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 19 May 2022 17:32:12 +0200 Subject: [PATCH] Added scraper support for the platforms arcadia (Emerson Arcadia 2001) and crvision (VTech CreatiVision). Also removed an unnecessary code comment. --- es-app/src/PlatformId.cpp | 2 ++ es-app/src/PlatformId.h | 2 ++ es-app/src/scrapers/GamesDBJSONScraper.cpp | 1 + es-app/src/scrapers/ScreenScraper.cpp | 2 ++ es-core/src/utils/PlatformUtil.cpp | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 47d844fd2..f94f9c693 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -26,6 +26,7 @@ namespace PlatformIds "apple2", // Apple II "apple2gs", // Apple IIGS "arcade", // Arcade + "arcadia", // Emerson Arcadia 2001 "astrocde", // Bally Astrocade "atari2600", // Atari 2600 "atari5200", // Atari 5200 @@ -45,6 +46,7 @@ namespace PlatformIds "channelf", // Fairchild Channel F "coco", // Tandy Color Computer "colecovision", // ColecoVision + "crvision", // VTech CreatiVision "daphne", // Daphne Arcade Laserdisc Emulator "dos", // DOS (PC) "dragon32", // Dragon 32 diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 4a29a479a..6670b8503 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -25,6 +25,7 @@ namespace PlatformIds APPLE_II, APPLE_IIGS, ARCADE, + ARCADIA_2001, BALLY_ASTROCADE, ATARI_2600, ATARI_5200, @@ -44,6 +45,7 @@ namespace PlatformIds FAIRCHILD_CHANNELF, TANDY_COLOR_COMPUTER, COLECOVISION, + VTECH_CREATIVISION, DAPHNE, DOS, DRAGON32, diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index a0edc5f01..f74f0c34b 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -44,6 +44,7 @@ namespace {AMSTRAD_CPC, "4914"}, {APPLE_II, "4942"}, {ARCADE, "23"}, + {ARCADIA_2001, "4963"}, {BALLY_ASTROCADE, "4968"}, {ATARI_800, "4943"}, {ATARI_2600, "22"}, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index 8155180fe..05543c0ba 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -36,6 +36,7 @@ namespace {APPLE_II, 86}, {APPLE_IIGS, 217}, {ARCADE, 75}, + {ARCADIA_2001, 94}, {BALLY_ASTROCADE, 44}, {ATARI_800, 43}, {ATARI_2600, 26}, @@ -50,6 +51,7 @@ namespace {BBC_MICRO, 37}, {CAVESTORY, 135}, {COLECOVISION, 48}, + {VTECH_CREATIVISION, 241}, {COMMODORE_64, 66}, {COMMODORE_CDTV, 129}, {COMMODORE_VIC20, 73}, diff --git a/es-core/src/utils/PlatformUtil.cpp b/es-core/src/utils/PlatformUtil.cpp index b0938a667..9657971d0 100644 --- a/es-core/src/utils/PlatformUtil.cpp +++ b/es-core/src/utils/PlatformUtil.cpp @@ -142,7 +142,7 @@ namespace Utils return returnValue; -#else // __unix__ +#else return 0; #endif }