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

Size and position of team icon in race gui is the same in different resolutions

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
deveee 2013-09-16 19:37:24 +00:00
parent 82590c791d
commit c192a431fa
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/states_screens/race_gui.cpp
View File

@ -245,16 +245,9 @@ void RaceGUI::drawScores()
file_manager->getTextureFile("soccer_ball_red.png")); file_manager->getTextureFile("soccer_ball_red.png"));
irr::video::ITexture *blue_team = irr_driver->getTexture( irr::video::ITexture *blue_team = irr_driver->getTexture(
file_manager->getTextureFile("soccer_ball_blue.png")); file_manager->getTextureFile("soccer_ball_blue.png"));
irr::video::ITexture *team_icon;
core::rect<s32> indicatorPos(offsetX-6, offsetY,
offsetX -6 + red_team->getSize().Width/8,
offsetY + red_team->getSize().Height/8);
core::rect<s32> sourceRect(core::position2d<s32>(0,0),
red_team->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(red_team,indicatorPos,sourceRect,
NULL,NULL,true);
int numLeader = 1;
for(unsigned int i=0; i<soccerWorld->getNumKarts(); i++){ for(unsigned int i=0; i<soccerWorld->getNumKarts(); i++){
int j = soccerWorld->getTeamLeader(i); int j = soccerWorld->getTeamLeader(i);
if(j < 0) break; if(j < 0) break;
@ -274,17 +267,23 @@ void RaceGUI::drawScores()
position.LowerRightCorner.Y + string_height); position.LowerRightCorner.Y + string_height);
font->draw(score.c_str(),pos,color); font->draw(score.c_str(),pos,color);
switch(numLeader)
{
case 1: team_icon = red_team; break;
case 2: team_icon = blue_team; break;
default: break;
}
core::rect<s32> indicatorPos(offsetX, offsetY,
offsetX + m_marker_player_size/1.25,
offsetY + m_marker_player_size/1.25);
core::rect<s32> sourceRect(core::position2d<s32>(0,0),
team_icon->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(team_icon,indicatorPos,sourceRect,
NULL,NULL,true);
numLeader++;
offsetX += position.LowerRightCorner.X; offsetX += position.LowerRightCorner.X;
} }
offsetX = 80;
offsetY = 5;
indicatorPos = core::rect<s32>(offsetX, offsetY,
offsetX + blue_team->getSize().Width/8,
offsetY + blue_team->getSize().Height/8);
sourceRect = core::rect<s32> (core::position2d<s32>(0,0),
blue_team->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(blue_team,indicatorPos,sourceRect,
NULL,NULL,true);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Displays the racing time on the screen.s /** Displays the racing time on the screen.s