diff --git a/src/modes/world.cpp b/src/modes/world.cpp index 6d35d1c02..658b3e41b 100644 --- a/src/modes/world.cpp +++ b/src/modes/world.cpp @@ -182,7 +182,8 @@ void World::init() void World::createRaceGUI() { - if(UserConfigParams::m_minimal_race_gui) + if(UserConfigParams::m_minimal_race_gui && + race_manager->getTrackName() != "tutorial") m_race_gui = new MinimalRaceGUI(); else m_race_gui = new RaceGUI(); diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp index 3b76f066c..6a4e4b94e 100644 --- a/src/states_screens/race_gui.cpp +++ b/src/states_screens/race_gui.cpp @@ -81,6 +81,8 @@ RaceGUI::RaceGUI() m_map_left = UserConfigParams::m_width - m_map_width; } + m_is_tutorial = (race_manager->getTrackName() == "tutorial"); + m_speed_meter_icon = material_manager->getMaterial("speedback.png"); m_speed_bar_icon = material_manager->getMaterial("speedfore.png"); createMarkerTexture(); @@ -161,15 +163,20 @@ void RaceGUI::renderGlobal(float dt) if(!world->isRacePhase()) return; if (!m_enabled) return; - drawGlobalTimer(); - if(world->getPhase() == WorldStatus::GO_PHASE || - world->getPhase() == WorldStatus::MUSIC_PHASE) - { - drawGlobalMusicDescription(); - } - drawGlobalMiniMap(); - drawGlobalPlayerIcons(m_map_height); + if (!m_is_tutorial) + { + drawGlobalTimer(); + if(world->getPhase() == WorldStatus::GO_PHASE || + world->getPhase() == WorldStatus::MUSIC_PHASE) + { + drawGlobalMusicDescription(); + } + } + + drawGlobalMiniMap(); + + if (!m_is_tutorial) drawGlobalPlayerIcons(m_map_height); } // renderGlobal //----------------------------------------------------------------------------- @@ -194,7 +201,9 @@ void RaceGUI::renderPlayerView(const AbstractKart *kart, float dt) drawPowerupIcons (kart, viewport, scaling); drawSpeedAndEnergy (kart, viewport, scaling); - drawRankLap (kart, viewport); + + if (!m_is_tutorial) + drawRankLap (kart, viewport); RaceGUIBase::renderPlayerView(kart, dt); } // renderPlayerView diff --git a/src/states_screens/race_gui.hpp b/src/states_screens/race_gui.hpp index e910344bb..1abd92390 100644 --- a/src/states_screens/race_gui.hpp +++ b/src/states_screens/race_gui.hpp @@ -90,6 +90,8 @@ private: int m_timer_width; + bool m_is_tutorial; + /* Display informat for one player on the screen. */ void drawEnergyMeter (int x, int y, const AbstractKart *kart, const core::recti &viewport,