From 657e02efe4ee4849ea4eb4c872fcc6ba84b2bfcb Mon Sep 17 00:00:00 2001
From: riso <4726939+risostk@users.noreply.github.com>
Date: Sat, 5 Oct 2019 12:14:09 -0500
Subject: [PATCH] Clean icon name (Improve PR#4073) (#4081)

* fix icon names

* add file mode_weapon.png
---
 .../online/server_configuration_dialog.stkgui       |   2 +-
 data/gui/icons/{weapons.png => mode_weapons.png}    | Bin
 data/gui/screens/grand_prix_editor.stkgui           |   2 +-
 data/gui/screens/help2.stkgui                       |   4 ++--
 data/gui/screens/help3.stkgui                       |   2 +-
 data/gui/screens/help4.stkgui                       |   2 +-
 data/gui/screens/help5.stkgui                       |   2 +-
 data/gui/screens/help6.stkgui                       |   2 +-
 data/gui/screens/help7.stkgui                       |   2 +-
 data/gui/screens/online/create_server.stkgui        |   2 +-
 src/race/race_manager.hpp                           |   4 ++--
 src/states_screens/race_gui.cpp                     |   2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename data/gui/icons/{weapons.png => mode_weapons.png} (100%)

diff --git a/data/gui/dialogs/online/server_configuration_dialog.stkgui b/data/gui/dialogs/online/server_configuration_dialog.stkgui
index 3f627a9fe..8966469ac 100644
--- a/data/gui/dialogs/online/server_configuration_dialog.stkgui
+++ b/data/gui/dialogs/online/server_configuration_dialog.stkgui
@@ -25,7 +25,7 @@
                         I18N="Multiplayer game mode" text="Normal Race"/>
                 <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
                         I18N="Multiplayer game mode" text="Time Trial"/>
-                <icon-button id="3strikes" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="3strikes" width="128" height="128" icon="gui/icons/mode_weapons.png"
                         I18N="Multiplayer game mode" text="Battle"/>
                 <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
                         I18N="Multiplayer game mode" text="Soccer"/>
diff --git a/data/gui/icons/weapons.png b/data/gui/icons/mode_weapons.png
similarity index 100%
rename from data/gui/icons/weapons.png
rename to data/gui/icons/mode_weapons.png
diff --git a/data/gui/screens/grand_prix_editor.stkgui b/data/gui/screens/grand_prix_editor.stkgui
index bdecd35ba..0846c3cc8 100644
--- a/data/gui/screens/grand_prix_editor.stkgui
+++ b/data/gui/screens/grand_prix_editor.stkgui
@@ -34,7 +34,7 @@
                 I18N="Menu item" text="New" />
             <icon-button id="copy" width="128" height="128" icon="gui/icons/gp_copy.png"
                 I18N="Menu item" text="Copy" />
-            <icon-button id="edit" width="128" height="128" icon="gui/icons/edit.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/icons/gp_edit.png"
                 I18N="Menu item" text="Edit" />
             <icon-button id="remove" width="128" height="128" icon="gui/icons/gp_remove.png"
                 I18N="Menu item" text="Remove" />
diff --git a/data/gui/screens/help2.stkgui b/data/gui/screens/help2.stkgui
index 279ad6728..7da9ae435 100644
--- a/data/gui/screens/help2.stkgui
+++ b/data/gui/screens/help2.stkgui
@@ -8,7 +8,7 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
@@ -56,7 +56,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/icons/mode_3strikes.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_weapons.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
diff --git a/data/gui/screens/help3.stkgui b/data/gui/screens/help3.stkgui
index 91628cff2..95f0364e3 100644
--- a/data/gui/screens/help3.stkgui
+++ b/data/gui/screens/help3.stkgui
@@ -8,7 +8,7 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
diff --git a/data/gui/screens/help4.stkgui b/data/gui/screens/help4.stkgui
index f6c24aa3f..8aa1c285a 100644
--- a/data/gui/screens/help4.stkgui
+++ b/data/gui/screens/help4.stkgui
@@ -8,7 +8,7 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
diff --git a/data/gui/screens/help5.stkgui b/data/gui/screens/help5.stkgui
index b3164fea8..05d36e1a0 100644
--- a/data/gui/screens/help5.stkgui
+++ b/data/gui/screens/help5.stkgui
@@ -8,7 +8,7 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
diff --git a/data/gui/screens/help6.stkgui b/data/gui/screens/help6.stkgui
index 40fd83cd5..4b54279ba 100644
--- a/data/gui/screens/help6.stkgui
+++ b/data/gui/screens/help6.stkgui
@@ -8,7 +8,7 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
diff --git a/data/gui/screens/help7.stkgui b/data/gui/screens/help7.stkgui
index 461e27225..a6c96eec2 100644
--- a/data/gui/screens/help7.stkgui
+++ b/data/gui/screens/help7.stkgui
@@ -8,7 +8,7 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
diff --git a/data/gui/screens/online/create_server.stkgui b/data/gui/screens/online/create_server.stkgui
index 285de6fc8..6774fb2ea 100644
--- a/data/gui/screens/online/create_server.stkgui
+++ b/data/gui/screens/online/create_server.stkgui
@@ -42,7 +42,7 @@
                         I18N="Multiplayer game mode" text="Normal Race"/>
                 <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
                         I18N="Multiplayer game mode" text="Time Trial"/>
-                <icon-button id="3strikes" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="3strikes" width="128" height="128" icon="gui/icons/mode_weapons.png"
                         I18N="Multiplayer game mode" text="Battle"/>
                 <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
                         I18N="Multiplayer game mode" text="Soccer"/>
diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index f5450461f..a47b72dab 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -166,8 +166,8 @@ public:
             case MINOR_MODE_TIME_TRIAL:     return "/gui/icons/mode_tt.png";
             case MINOR_MODE_FOLLOW_LEADER:  return "/gui/icons/mode_ftl.png";
             case MINOR_MODE_3_STRIKES:      return "/gui/icons/mode_3strikes.png";
-            case MINOR_MODE_FREE_FOR_ALL:   return "/gui/icons/weapons.png";
-            case MINOR_MODE_CAPTURE_THE_FLAG: return "/gui/icons/weapons.png";
+            case MINOR_MODE_FREE_FOR_ALL:   return "/gui/icons/mode_weapons.png";
+            case MINOR_MODE_CAPTURE_THE_FLAG: return "/gui/icons/mode_weapons.png";
             case MINOR_MODE_EASTER_EGG:     return "/gui/icons/mode_easter.png";
             case MINOR_MODE_SOCCER:         return "/gui/icons/mode_soccer.png";
             default: assert(false); return NULL;
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 748faa923..51a421c4c 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -120,7 +120,7 @@ RaceGUI::RaceGUI()
     m_blue_flag = irr_driver->getTexture(FileManager::GUI_ICON, "blue_flag.png");
     m_soccer_ball = irr_driver->getTexture(FileManager::GUI_ICON, "soccer_ball_normal.png");
     m_heart_icon = irr_driver->getTexture(FileManager::GUI_ICON, "heart.png");
-    m_champion = irr_driver->getTexture(FileManager::GUI_ICON, "gp_new.png");
+    m_champion = irr_driver->getTexture(FileManager::GUI_ICON, "cup_gold.png");
 }   // RaceGUI
 
 //-----------------------------------------------------------------------------