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

Bugfix in new animated icons: if the kart positions were not in the right order

Browse Source 
when stk is started (i.e. kart with world id 8 is on position 10 instead of 9)
then the race gui would crash. While this situation should not happen (the 
incorrect position happens if a kart has an invalid start position and is 
therefore rescued when the 'go' happens), this patch avoids a crash, helping
tpo diagnose other problems.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-09-05 23:41:59 +00:00
parent ebf6f561a9
commit a9d0acef3e
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/states_screens/race_gui.cpp
View File

@ -400,6 +400,23 @@ void RaceGUI::drawGlobalPlayerIcons(const KartIconDisplayInfo* info)
{
int x_base = 15;
int y_base = 20;
int ICON_WIDTH=(int)(40*(UserConfigParams::m_width/800.0f));
int ICON_PLAYER_WIDTH=(int)(50*(UserConfigParams::m_width/800.0f));
if(UserConfigParams::m_height<600)
{
ICON_WIDTH = 27;
ICON_PLAYER_WIDTH = 35;
}
//initialize m_previous_icons_position
if(m_previous_icons_position.size()==0)
{
for(unsigned int i=0; i<race_manager->getNumberOfKarts(); i++)
{
core::vector2d<s32> pos(x_base,y_base+i*(ICON_PLAYER_WIDTH+2));
m_previous_icons_position.push_back(pos);
}
}
// Special case : when 3 players play, use 4th window to display such stuff
if (race_manager->getNumLocalPlayers() == 3)
@ -413,13 +430,6 @@ void RaceGUI::drawGlobalPlayerIcons(const KartIconDisplayInfo* info)
float previous_distance=10000.0;//far ahead
int ICON_WIDTH=(int)(40*(UserConfigParams::m_width/800.0f));
int ICON_PLAYER_WIDTH=(int)(50*(UserConfigParams::m_width/800.0f));
if(UserConfigParams::m_height<600)
{
ICON_WIDTH = 27;
ICON_PLAYER_WIDTH = 35;
}
int previous_x=x_base;
int previous_y=y_base-ICON_PLAYER_WIDTH-2;
@ -467,14 +477,6 @@ void RaceGUI::drawGlobalPlayerIcons(const KartIconDisplayInfo* info)
previous_x=x;//save coord of the previous kart in list
previous_y=y;
//initialize m_previous_icons_position
if (m_previous_icons_position.size()<kart_amount)
{
core::vector2d<s32> pos(x,y);
m_previous_icons_position.push_back(pos);
}
//soft movement using previous position:
x=(int)((x+m_previous_icons_position[kart_id].X*m_icons_inertia)
/(m_icons_inertia+1));