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

'Prepared' bugfix (for once we have a in-race menu):

Browse Source 
if a player presses esc. after finishing a race in a 
GP, but before the race is finished, rerunRace() will
reset the scores and times to the previous values - 
but in case of karts who haven't finished the race 
that was undefined.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3840 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-08-12 02:55:53 +00:00
parent bd2c6c27b5
commit 209d679a56
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/race/race_manager.cpp
View File

@ -265,7 +265,19 @@ void RaceManager::startNextRace()
else if(m_minor_mode==MINOR_MODE_QUICK_RACE || m_minor_mode==MINOR_MODE_TIME_TRIAL) new StandardRace();
else if(m_minor_mode==MINOR_MODE_3_STRIKES) new ThreeStrikesBattle();
else{ fprintf(stderr,"Could not create given race mode\n"); assert(0); }
// Save the current score and set last time to zero. This is necessary
// if someone presses esc after finishing a gp, and selects restart:
// The race is rerun, and the points and scores get reset ... but if
// a kart hasn't finished the race at this stage, last_score and time
// would be undefined.
for(int i=0; i<m_num_karts; i++)
{
m_kart_status[i].m_last_score = m_kart_status[i].m_score;
m_kart_status[i].m_last_time = 0;
}
m_active_race = true;
} // startNextRace
//-----------------------------------------------------------------------------
@ -397,8 +409,6 @@ void RaceManager::exitRace()
void RaceManager::RaceFinished(const Kart *kart, float time)
{
unsigned int id = kart->getWorldKartId();
// In follow the leader mode, kart 0 does not get any points,
// so the position of each kart is actually one better --> decrease pos
int pos = kart->getPosition();
assert(pos-1 >= 0);