ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on tutorial

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-01-17 00:58:40 +00:00
parent e8fa09ab11
commit 14c058a311
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modes/world.cpp
View File

@ -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();

11
src/states_screens/race_gui.cpp
View File

@ -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;
if (!m_is_tutorial)
{
drawGlobalTimer();
if(world->getPhase() == WorldStatus::GO_PHASE ||
world->getPhase() == WorldStatus::MUSIC_PHASE)
{
drawGlobalMusicDescription();
}
}
drawGlobalMiniMap();
drawGlobalPlayerIcons(m_map_height);
if (!m_is_tutorial) drawGlobalPlayerIcons(m_map_height);
} // renderGlobal
//-----------------------------------------------------------------------------
@ -194,6 +201,8 @@ void RaceGUI::renderPlayerView(const AbstractKart *kart, float dt)
drawPowerupIcons (kart, viewport, scaling);
drawSpeedAndEnergy (kart, viewport, scaling);
if (!m_is_tutorial)
drawRankLap (kart, viewport);
RaceGUIBase::renderPlayerView(kart, dt);

2
src/states_screens/race_gui.hpp
View File

@ -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,