From f47b410d92304008a675c12c69e944a58c80c86f Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 24 Mar 2020 00:46:20 +0800
Subject: [PATCH] Add soccer support to show karts held powerups

---
 src/modes/soccer_world.cpp           | 65 +++++++++++++++++++++++-----
 src/modes/soccer_world.hpp           |  2 +-
 src/states_screens/race_gui_base.cpp |  7 +--
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/src/modes/soccer_world.cpp b/src/modes/soccer_world.cpp
index bd4df31ff..4517536d4 100644
--- a/src/modes/soccer_world.cpp
+++ b/src/modes/soccer_world.cpp
@@ -355,7 +355,6 @@ void SoccerWorld::reset(bool restart)
     // ie make this kart less likely to affect gaming result
     if (UserConfigParams::m_arena_ai_stats)
         getKart(8)->flyUp();
-
 }   // reset
 
 //-----------------------------------------------------------------------------
@@ -404,9 +403,15 @@ void SoccerWorld::update(int ticks)
     WorldWithRank::update(ticks);
     WorldWithRank::updateTrack(ticks);
 
-    if (isGoalPhase())
+    std::vector<int> red_id, blue_id;
+    for (unsigned int i = 0; i < m_karts.size(); i++)
     {
-        for (unsigned int i = 0; i < m_karts.size(); i++)
+        if (getKartTeam(i) == KART_TEAM_RED)
+            red_id.push_back(i);
+        else
+            blue_id.push_back(i);
+
+        if (isGoalPhase())
         {
             auto& kart = m_karts[i];
             if (kart->isEliminated())
@@ -422,18 +427,26 @@ void SoccerWorld::update(int ticks)
             kart->getBody()->proceedToTransform(m_goal_transforms[i]);
             kart->setTrans(m_goal_transforms[i]);
         }
-        if (m_ticks_back_to_own_goal - getTicksSinceStart() == 1 &&
-            !isRaceOver())
-        {
-            // Reset all karts and ball
-            resetKartsToSelfGoals();
-            if (UserConfigParams::m_arena_ai_stats)
-                getKart(8)->flyUp();
-        }
     }
+    if (isGoalPhase() &&
+        m_ticks_back_to_own_goal - getTicksSinceStart() == 1 && !isRaceOver())
+    {
+        // Reset all karts and ball
+        resetKartsToSelfGoals();
+        if (UserConfigParams::m_arena_ai_stats)
+            getKart(8)->flyUp();
+    }
+
     if (UserConfigParams::m_arena_ai_stats)
         m_frame_count++;
-
+    // We only use kart position for spliting team in race gui drawing
+    beginSetKartPositions();
+    int pos = 1;
+    for (int id : red_id)
+        setKartPosition(id, pos++);
+    for (int id : blue_id)
+        setKartPosition(id, pos++);
+    endSetKartPositions();
 }   // update
 
 //-----------------------------------------------------------------------------
@@ -1059,3 +1072,31 @@ Vec3 SoccerWorld::getBallAimPosition(KartTeam team, bool reverse) const
 {
     return m_bgd->getAimPosition(team, reverse);
 }   // getBallAimPosition
+
+// ----------------------------------------------------------------------------
+/** Returns the data to display in the race gui.
+ */
+void SoccerWorld::getKartsDisplayInfo(
+                           std::vector<RaceGUIBase::KartIconDisplayInfo> *info)
+{
+    const unsigned int kart_amount = getNumKarts();
+    for (unsigned int i = 0; i < kart_amount ; i++)
+    {
+        RaceGUIBase::KartIconDisplayInfo& rank_info = (*info)[i];
+        rank_info.lap = -1;
+        rank_info.m_outlined_font = true;
+        rank_info.m_color = getKartTeam(i) == KART_TEAM_RED ?
+            video::SColor(255, 255, 0, 0) : video::SColor(255, 0, 0, 255);
+        rank_info.m_text = getKart(i)->getController()->getName();
+        if (RaceManager::get()->getKartGlobalPlayerId(i) > -1)
+        {
+            const core::stringw& flag = StringUtils::getCountryFlag(
+                RaceManager::get()->getKartInfo(i).getCountryCode());
+            if (!flag.empty())
+            {
+                rank_info.m_text += L" ";
+                rank_info.m_text += flag;
+            }
+        }
+    }
+}   // getKartsDisplayInfo
diff --git a/src/modes/soccer_world.hpp b/src/modes/soccer_world.hpp
index 689d2f048..47b0bfc55 100644
--- a/src/modes/soccer_world.hpp
+++ b/src/modes/soccer_world.hpp
@@ -144,7 +144,7 @@ public:
         OVERRIDE;
     virtual bool useFastMusicNearEnd() const OVERRIDE { return false; }
     virtual void getKartsDisplayInfo(
-               std::vector<RaceGUIBase::KartIconDisplayInfo> *info) OVERRIDE {}
+               std::vector<RaceGUIBase::KartIconDisplayInfo> *info) OVERRIDE;
 
     virtual bool raceHasLaps() OVERRIDE { return false; }
 
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 676bcc621..f63ee42a1 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -757,11 +757,7 @@ void RaceGUIBase::drawGlobalReadySetGo()
 void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
 {
 #ifndef SERVER_ONLY
-    // For now, don't draw player icons when in soccer mode
     const RaceManager::MinorRaceModeType  minor_mode = RaceManager::get()->getMinorMode();
-    if(minor_mode == RaceManager::MINOR_MODE_SOCCER)
-        return;
-
     int x_base = 10;
     if (irr_driver->getDevice()->getLeftPadding() > 0)
         x_base += irr_driver->getDevice()->getLeftPadding();
@@ -866,7 +862,8 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
         if (minor_mode==RaceManager::MINOR_MODE_3_STRIKES ||
             minor_mode==RaceManager::MINOR_MODE_FREE_FOR_ALL ||
             minor_mode==RaceManager::MINOR_MODE_CAPTURE_THE_FLAG ||
-            minor_mode==RaceManager::MINOR_MODE_EASTER_EGG)
+            minor_mode==RaceManager::MINOR_MODE_EASTER_EGG ||
+            minor_mode==RaceManager::MINOR_MODE_SOCCER)
         {
             x = x_base;
             y = previous_y+ICON_PLAYER_WIDTH+2;