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

Bugfix: the new lap end condition did not work if a kart would

Browse Source 
skip the last (or first) driveline when driving over the starting
line. This resulted in incorrect (duplicated/missing) positions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-12-15 06:35:17 +00:00
parent 28d119a9b0
commit c240c657cf
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/modes/linear_world.cpp
View File

@@ -148,6 +148,20 @@ void LinearWorld::update(float delta)
m_kart_info[i].m_estimated_finish = estimateFinishTimeForKart(m_kart[i]);
}
}
#ifdef SPECIAL_POSITION_DEBUG
int xx[10];
for(int i=0; i<10; i++) xx[i]=-99;
for(unsigned int i=0; i<kart_amount; i++)
{
if(xx[m_kart[i]->getPosition()]!=-99)
{
printf("Error\n");
exit(-1);
}
xx[m_kart[i]->getPosition()]=i;
}
#endif
for(unsigned int n=0; n<kart_amount; n++)
{
KartInfo& kart_info = m_kart_info[n];
@@ -239,11 +253,12 @@ void LinearWorld::update(float delta)
//-----------------------------------------------------------------------------
void LinearWorld::doLapCounting ( KartInfo& kart_info, Kart* kart )
{
//bool newLap = kart_info.m_last_track_coords[1] > 300.0f &&
// kart_info.m_curr_track_coords.getY() < 20.0f;
bool newLap = kart_info.m_last_track_coords[1] > 300.0f &&
kart_info.m_curr_track_coords.getY() < 20.0f;
const bool newLap = kart_info.m_last_valid_sector == (int)RaceManager::getTrack()->m_distance_from_start.size()-1 &&
kart_info.m_track_sector == 0;
// This fails if a kart skips a sector (or comes from the outside of the drivelines)
// const bool newLap = kart_info.m_last_valid_sector == (int)RaceManager::getTrack()->m_distance_from_start.size()-1 &&
// kart_info.m_track_sector == 0;
if ( newLap )
{
// Only increase the lap counter and set the new time if the