Merge branch 'master' of https://github.com/supertuxkart/stk-code

src/modes/linear_world.hpp

@@ -188,6 +188,12 @@ public:
     {
         return m_kart_info[kart_index].m_overall_distance;
     }   // getOverallDistance
+
+    /** Returns time for the fastest laps */
+    float getFastestLap() const
+    {
+        return m_fastest_lap;
+    }
 };   // LinearWorld
 
 #endif

src/network/protocols/server_lobby_room_protocol.cpp

@@ -33,7 +33,7 @@
 #include "network/stk_peer.hpp"
 #include "online/online_profile.hpp"
 #include "online/request_manager.hpp"
-#include "states_screens//networking_lobby.hpp"
+#include "states_screens/networking_lobby.hpp"
 #include "states_screens/race_result_gui.hpp"
 #include "states_screens/waiting_for_others.hpp"
 #include "utils/log.hpp"

src/states_screens/race_result_gui.cpp

@@ -828,7 +828,7 @@ void RaceResultGUI::backToLobby()
         if (race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX ||
             m_animation_state == RR_RACE_RESULT)
         {
-            displayHighScores();
+            displayPostRaceInfo();
         }
     }   // renderGlobal
 
@@ -904,11 +904,11 @@ void RaceResultGUI::backToLobby()
 
     //-----------------------------------------------------------------------------
     /** Returns a string to display next to a kart. For a player that's the name
-     *  of the player, for an AI kart it's the name of the driver. 
+     *  of the player, for an AI kart it's the name of the driver.
      */
     core::stringw RaceResultGUI::getKartDisplayName(const AbstractKart *kart) const
     {
-        const EndController *ec = 
+        const EndController *ec =
             dynamic_cast<const EndController*>(kart->getController());
         // If the race was given up, there is no end controller for the
         // players, so this case needs to be handled separately
@@ -917,7 +917,7 @@ void RaceResultGUI::backToLobby()
         else
         {
             // No end controller, check explicitely for a player controller
-            const PlayerController *pc = 
+            const PlayerController *pc =
                 dynamic_cast<const PlayerController*>(kart->getController());
             // Check if the kart is a player controller to get the real name
             if(pc) return pc->getName();
@@ -1322,21 +1322,24 @@ void RaceResultGUI::backToLobby()
     }   // cleanupGPProgress
 
     // ----------------------------------------------------------------------------
-    void RaceResultGUI::displayHighScores()
+    void RaceResultGUI::displayPostRaceInfo()
     {
         // This happens in demo world
         if (!World::getWorld())
             return;
 
         Highscores* scores = World::getWorld()->getHighscores();
+
+        video::SColor white_color = video::SColor(255, 255, 255, 255);
+
+        int x = (int)(UserConfigParams::m_width*0.65f);
+        int y = m_top;
+
+        int current_y = y;
+
         // In some case for exemple FTL they will be no highscores
         if (scores != NULL)
         {
-            video::SColor white_color = video::SColor(255, 255, 255, 255);
-
-            int x = (int)(UserConfigParams::m_width*0.65f);
-            int y = m_top;
-
             // First draw title
             GUIEngine::getFont()->draw(_("Highscores"),
                 core::recti(x, y, 0, 0),
@@ -1369,7 +1372,7 @@ void RaceResultGUI::backToLobby()
                 }
 
                 int current_x = x;
-                int current_y = y + (int)((i + 1) * m_distance_between_rows * 1.5f);
+                current_y = y + (int)((i + 1) * m_distance_between_rows * 1.5f);
 
                 const KartProperties* prop = kart_properties_manager->getKart(kart_name);
                 if (prop != NULL)
@@ -1410,6 +1413,36 @@ void RaceResultGUI::backToLobby()
                     false, false, NULL, true /* ignoreRTL */);
             }
         }
+
+        if (race_manager->getMinorMode() != RaceManager::MINOR_MODE_SOCCER)
+        {
+            // display lap count
+            if (race_manager->modeHasLaps())
+            {
+                core::stringw laps = _("Laps: %i", race_manager->getNumLaps());
+                current_y += m_distance_between_rows * 0.8f * 2;
+                GUIEngine::getFont()->draw(laps, core::recti(x, current_y, 0, 0),
+                    white_color, false, false, nullptr, true);
+            }
+            // display difficulty
+            const core::stringw& difficulty_name =
+                race_manager->getDifficultyName(race_manager->getDifficulty());
+            core::stringw difficulty_string = _("Difficulty: %s", difficulty_name);
+            current_y += m_distance_between_rows * 0.8f;
+            GUIEngine::getFont()->draw(difficulty_string, core::recti(x, current_y, 0, 0),
+                white_color, false, false, nullptr, true);
+            // show fastest lap
+            if (race_manager->modeHasLaps())
+            {
+                float best_lap_time = static_cast<LinearWorld*>(World::getWorld())->getFastestLap();
+                core::stringw best_lap_string = _("Best lap time: %s",
+                    StringUtils::timeToString(best_lap_time).c_str());
+                current_y += m_distance_between_rows * 0.8f;
+                GUIEngine::getFont()->draw(best_lap_string,
+                    core::recti(x, current_y, 0, 0), white_color, false, false,
+                    nullptr, true);
+            }
+        }
     }
 
     // ----------------------------------------------------------------------------

src/states_screens/race_result_gui.hpp

@@ -191,7 +191,7 @@ private:
     void addGPProgressWidget(GUIEngine::Widget* widget);
     void displayGPProgress();
     void cleanupGPProgress();
-    void displayHighScores();
+    void displayPostRaceInfo();
     void displaySoccerResults();
     void displayScreenShots();
     irr::core::stringw getKartDisplayName(const AbstractKart *kart) const;