From 7bf1e2d706c6839439f7ad980a5198724c6f6dcd Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 7 Feb 2021 15:28:23 +0100
Subject: [PATCH] Renamed the game system Nintendo GameCube from gamecube to
 gc.

---
 es-app/src/PlatformId.cpp                      |  8 ++++----
 es-app/src/PlatformId.h                        |  2 +-
 resources/templates/es_systems.cfg_macos       | 18 +++++++++---------
 resources/templates/es_systems.cfg_unix        | 18 +++++++++---------
 .../templates/es_systems.cfg_unix_flatpak      | 18 +++++++++---------
 resources/templates/es_systems.cfg_windows     | 18 +++++++++---------
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index c13d24671..9738b9b27 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -13,7 +13,7 @@
 
 namespace PlatformIds
 {
-    std::vector<std::string> PlatformNames = {
+    std::vector<std::string> platformNames = {
         "unknown", // Nothing set.
 
         "3do",                  // 3DO
@@ -49,11 +49,11 @@ namespace PlatformIds
         "famicom",              // Nintendo Family Computer
         "fds",                  // Nintendo Famicom Disk System
         "gameandwatch",         // Nintendo Game and Watch
-        "gamecube",             // Nintendo GameCube
         "gamegear",             // Sega Game Gear
         "gb",                   // Nintendo Game Boy
         "gba",                  // Nintendo Game Boy Advance
         "gbc",                  // Nintendo Game Boy Color
+        "gc",                   // Nintendo GameCube
         "genesis",              // Sega Genesis
         "gx4000",               // Amstrad GX4000
         "intellivision",        // Mattel Electronics Intellivision
@@ -132,7 +132,7 @@ namespace PlatformIds
             return PLATFORM_UNKNOWN;
 
         for (unsigned int i = 1; i < PLATFORM_COUNT; i++) {
-            if (PlatformNames[i] == str)
+            if (platformNames[i] == str)
                 return (PlatformId)i;
         }
 
@@ -141,6 +141,6 @@ namespace PlatformIds
 
     const std::string getPlatformName(PlatformId id)
     {
-        return PlatformNames[id];
+        return platformNames[id];
     }
 }
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index f7304d482..557a94346 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -49,11 +49,11 @@ namespace PlatformIds
         FAMICOM,
         FAMICOM_DISK_SYSTEM,
         NINTENDO_GAME_AND_WATCH,
-        NINTENDO_GAMECUBE,
         SEGA_GAME_GEAR,
         GAME_BOY,
         GAME_BOY_ADVANCE,
         GAME_BOY_COLOR,
+        NINTENDO_GAMECUBE,
         SEGA_GENESIS,
         AMSTRAD_GX4000,
         INTELLIVISION,
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index 8773c021a..f2235d105 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -361,15 +361,6 @@
     <platform>gameandwatch</platform>
     <theme>gameandwatch</theme>
   </system>
-  <system>
-    <name>gamecube</name>
-    <fullname>Nintendo GameCube</fullname>
-    <path>%ROMPATH%/gamecube</path>
-    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/dolphin_libretro.dylib %ROM%</command>
-    <platform>gamecube</platform>
-    <theme>gc</theme>
-  </system>
   <system>
     <name>gamegear</name>
     <fullname>Sega Game Gear</fullname>
@@ -406,6 +397,15 @@
     <platform>gbc</platform>
     <theme>gbc</theme>
   </system>
+  <system>
+    <name>gc</name>
+    <fullname>Nintendo GameCube</fullname>
+    <path>%ROMPATH%/gc</path>
+    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/dolphin_libretro.dylib %ROM%</command>
+    <platform>gc</platform>
+    <theme>gc</theme>
+  </system>
   <system>
     <name>genesis</name>
     <fullname>Sega Genesis</fullname>
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index b4ac78f0a..437288aee 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -361,15 +361,6 @@
     <platform>gameandwatch</platform>
     <theme>gameandwatch</theme>
   </system>
-  <system>
-    <name>gamecube</name>
-    <fullname>Nintendo GameCube</fullname>
-    <path>%ROMPATH%/gamecube</path>
-    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/dolphin_libretro.so %ROM%</command>
-    <platform>gamecube</platform>
-    <theme>gc</theme>
-  </system>
   <system>
     <name>gamegear</name>
     <fullname>Sega Game Gear</fullname>
@@ -406,6 +397,15 @@
     <platform>gbc</platform>
     <theme>gbc</theme>
   </system>
+  <system>
+    <name>gc</name>
+    <fullname>Nintendo GameCube</fullname>
+    <path>%ROMPATH%/gc</path>
+    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L %COREPATH%/dolphin_libretro.so %ROM%</command>
+    <platform>gc</platform>
+    <theme>gc</theme>
+  </system>
   <system>
     <name>genesis</name>
     <fullname>Sega Genesis</fullname>
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index 6ecea9b91..11fee85fb 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -361,15 +361,6 @@
     <platform>gameandwatch</platform>
     <theme>gameandwatch</theme>
   </system>
-  <system>
-    <name>gamecube</name>
-    <fullname>Nintendo GameCube</fullname>
-    <path>%ROMPATH%/gamecube</path>
-    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
-    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/dolphin_libretro.so %ROM%</command>
-    <platform>gamecube</platform>
-    <theme>gc</theme>
-  </system>
   <system>
     <name>gamegear</name>
     <fullname>Sega Game Gear</fullname>
@@ -406,6 +397,15 @@
     <platform>gbc</platform>
     <theme>gbc</theme>
   </system>
+  <system>
+    <name>gc</name>
+    <fullname>Nintendo GameCube</fullname>
+    <path>%ROMPATH%/gc</path>
+    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/dolphin_libretro.so %ROM%</command>
+    <platform>gc</platform>
+    <theme>gc</theme>
+  </system>
   <system>
     <name>genesis</name>
     <fullname>Sega Genesis</fullname>
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 46e081cc2..24fb7aca1 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -361,15 +361,6 @@
     <platform>gameandwatch</platform>
     <theme>gameandwatch</theme>
   </system>
-  <system>
-    <name>gamecube</name>
-    <fullname>Nintendo GameCube</fullname>
-    <path>%ROMPATH%\gamecube</path>
-    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\dolphin_libretro.dll %ROM%</command>
-    <platform>gamecube</platform>
-    <theme>gc</theme>
-  </system>
   <system>
     <name>gamegear</name>
     <fullname>Sega Game Gear</fullname>
@@ -406,6 +397,15 @@
     <platform>gbc</platform>
     <theme>gbc</theme>
   </system>
+  <system>
+    <name>gc</name>
+    <fullname>Nintendo GameCube</fullname>
+    <path>%ROMPATH%\gc</path>
+    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L %EMUPATH%\cores\dolphin_libretro.dll %ROM%</command>
+    <platform>gc</platform>
+    <theme>gc</theme>
+  </system>
   <system>
     <name>genesis</name>
     <fullname>Sega Genesis</fullname>