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

Removed scaling parameter from race gui lap

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-04-28 00:07:48 +00:00
parent a3ad6c20e5
commit 271287f192
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/states_screens/race_gui.cpp
View File

@@ -282,7 +282,7 @@ void RaceGUI::renderPlayerView(const Kart *kart)
drawPowerupIcons (kart, viewport, scaling);
drawEnergyMeter (kart, viewport, scaling);
drawSpeed (kart, viewport, scaling);
drawLap (info, kart, viewport, scaling);
drawLap (info, kart, viewport);
} // renderPlayerView
@@ -598,8 +598,7 @@ void RaceGUI::drawSpeed(const Kart* kart, const core::recti &viewport,
//-----------------------------------------------------------------------------
void RaceGUI::drawLap(const KartIconDisplayInfo* info, const Kart* kart,
const core::recti &viewport,
const core::vector2df &scaling)
const core::recti &viewport)
{
// Don't display laps in follow the leader mode
if(!World::getWorld()->raceHasLaps()) return;
@@ -609,14 +608,11 @@ void RaceGUI::drawLap(const KartIconDisplayInfo* info, const Kart* kart,
if(lap<0) return; // don't display 'lap 0/...'
core::recti pos;
pos.UpperLeftCorner.X = viewport.UpperLeftCorner.X
+ (int)(0.15f*UserConfigParams::m_width*scaling.X);
pos.UpperLeftCorner.X = viewport.UpperLeftCorner.X + (int)(0.15f*UserConfigParams::m_width);
pos.UpperLeftCorner.Y = viewport.LowerRightCorner.Y;
gui::IGUIFont* font = GUIEngine::getFont();
//FIXME: font height is multiplied by "scaling.Y" here, but the font itself is actually not scaled,
// resulting in overlapping of the two lines
int font_height = (int)(font->getDimension(L"X").Height*scaling.Y);
int font_height = (int)(font->getDimension(L"X").Height);
if (kart->hasFinishedRace())
{

3
src/states_screens/race_gui.hpp
View File

@@ -173,8 +173,7 @@ private:
void drawSpeed (const Kart* kart, const core::recti &viewport,
const core::vector2df &scaling);
void drawLap (const KartIconDisplayInfo* info, const Kart* kart,
const core::recti &viewport,
const core::vector2df &scaling);
const core::recti &viewport);
void drawGlobalPlayerIcons (const KartIconDisplayInfo* info);
/** Display items that are shown once only (for all karts). */
void drawGlobalMiniMap ();