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

Bugfix: it was possible to take a shortcut and in the process of being

Browse Source 
rescued get a lap counted incorrectly, see bug 2453274 for details.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-12-22 00:33:25 +00:00
parent 2e0c4f7738
commit b9571a41f0
1 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/modes/linear_world.cpp
View File

@ -53,18 +53,14 @@ void LinearWorld::init()
//If m_track_sector == UNKNOWN_SECTOR, then the kart is not on top of //If m_track_sector == UNKNOWN_SECTOR, then the kart is not on top of
//the road, so we have to use another function to find the sector. //the road, so we have to use another function to find the sector.
if (info.m_track_sector == Track::UNKNOWN_SECTOR ) info.m_on_road = info.m_track_sector != Track::UNKNOWN_SECTOR;
if (!info.m_on_road)
{ {
info.m_on_road = false;
info.m_track_sector = info.m_track_sector =
m_track->findOutOfRoadSector(m_kart[n]->getXYZ(), m_track->findOutOfRoadSector(m_kart[n]->getXYZ(),
Track::RS_DONT_KNOW, Track::RS_DONT_KNOW,
Track::UNKNOWN_SECTOR ); Track::UNKNOWN_SECTOR );
} }
else
{
info.m_on_road = true;
}
m_track->spatialToTrack(info.m_curr_track_coords, m_track->spatialToTrack(info.m_curr_track_coords,
m_kart[n]->getXYZ(), m_kart[n]->getXYZ(),
@ -105,18 +101,14 @@ void LinearWorld::restartRace()
//If m_track_sector == UNKNOWN_SECTOR, then the kart is not on top of //If m_track_sector == UNKNOWN_SECTOR, then the kart is not on top of
//the road, so we have to use another function to find the sector. //the road, so we have to use another function to find the sector.
if (info.m_track_sector == Track::UNKNOWN_SECTOR ) info.m_on_road = info.m_track_sector != Track::UNKNOWN_SECTOR;
if (!info.m_on_road)
{ {
info.m_on_road = false;
info.m_track_sector = info.m_track_sector =
m_track->findOutOfRoadSector(m_kart[n]->getXYZ(), m_track->findOutOfRoadSector(m_kart[n]->getXYZ(),
Track::RS_DONT_KNOW, Track::RS_DONT_KNOW,
Track::UNKNOWN_SECTOR ); Track::UNKNOWN_SECTOR );
} }
else
{
info.m_on_road = true;
}
m_track->spatialToTrack(info.m_curr_track_coords, m_track->spatialToTrack(info.m_curr_track_coords,
m_kart[n]->getXYZ(), m_kart[n]->getXYZ(),
@ -160,35 +152,28 @@ void LinearWorld::update(float delta)
// Check if the kart is taking a shortcut (if it's not already doing one): // Check if the kart is taking a shortcut (if it's not already doing one):
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
if(kart_info.m_last_valid_sector != Track::UNKNOWN_SECTOR && kart_info.m_on_road = kart_info.m_track_sector != Track::UNKNOWN_SECTOR;
m_track->isShortcut(kart_info.m_last_valid_sector, kart_info.m_track_sector)) if(kart_info.m_on_road)
{ {
// bring karts back to where they left the track. if(m_track->isShortcut(kart_info.m_last_valid_sector, kart_info.m_track_sector))
rescueKartAfterShortcut(kart, kart_info); {
} // bring karts back to where they left the track.
rescueKartAfterShortcut(kart, kart_info);
if(kart_info.m_track_sector != Track::UNKNOWN_SECTOR) }
kart_info.m_last_valid_sector = kart_info.m_track_sector; kart_info.m_last_valid_sector = kart_info.m_track_sector;
} // last_valid_sectpr!=UNKNOWN_SECTOR
// check if kart is on the road - if not, find the closest sector
if (kart_info.m_track_sector == Track::UNKNOWN_SECTOR)
{
kart_info.m_on_road = false;
if( kart_info.m_curr_track_coords[0] > 0.0 )
kart_info.m_track_sector =
m_track->findOutOfRoadSector( kart->getXYZ(),
Track::RS_RIGHT,
prev_sector );
else
kart_info.m_track_sector =
m_track->findOutOfRoadSector( kart->getXYZ(),
Track::RS_LEFT,
prev_sector );
}
else else
{ {
kart_info.m_on_road = true; // Kart off road. Find the closest sector instead.
} kart_info.m_track_sector =
m_track->findOutOfRoadSector(kart->getXYZ(),
kart_info.m_curr_track_coords[0] > 0.0
? Track::RS_RIGHT
: Track::RS_LEFT,
prev_sector );
if(m_track->isShortcut(prev_sector, kart_info.m_track_sector))
rescueKartAfterShortcut(kart, kart_info);
}
// Update track coords (=progression) // Update track coords (=progression)
m_kart_info[n].m_last_track_coords = m_kart_info[n].m_curr_track_coords; m_kart_info[n].m_last_track_coords = m_kart_info[n].m_curr_track_coords;
@ -221,7 +206,7 @@ void LinearWorld::update(float delta)
} }
} }
#ifdef DEBUG #ifdef DEBUG
// Debug output in case that the double position error // FIXME: Debug output in case that the double position error
// occurs again. It can most likely be removed. // occurs again. It can most likely be removed.
int pos_used[10]; int pos_used[10];
for(int i=0; i<10; i++) pos_used[i]=-99; for(int i=0; i<10; i++) pos_used[i]=-99;
@ -313,7 +298,12 @@ void LinearWorld::doLapCounting ( KartInfo& kart_info, Kart* kart )
else if ( kart_info.m_curr_track_coords.getY() > track_length-delta && else if ( kart_info.m_curr_track_coords.getY() > track_length-delta &&
kart_info.m_last_track_coords.getY() < delta) kart_info.m_last_track_coords.getY() < delta)
{ {
kart_info.m_race_lap-- ; // Previously we had bugs where (on taking shortcuts etc) a lap was
// 'uncounted' more than once, resulting in m_race_lap=-2, and even if
// the starting line was then crossed correctly, it would still not be
// counted. The if can most likely be removed mid term.
if(kart_info.m_race_lap>-1)
kart_info.m_race_lap-- ;
// Prevent cheating by setting time to a negative number, indicating // Prevent cheating by setting time to a negative number, indicating
// that the line wasn't crossed properly. // that the line wasn't crossed properly.
kart_info.m_lap_start_time = -1.0f; kart_info.m_lap_start_time = -1.0f;
@ -629,6 +619,7 @@ void LinearWorld::updateRacePosition ( Kart* kart, KartInfo& kart_info )
m_faster_music_active=true; m_faster_music_active=true;
} }
} // updateRacePosition } // updateRacePosition
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Checks if a kart is going in the wrong direction. This is done only for /** Checks if a kart is going in the wrong direction. This is done only for
* player karts to display a message to the player. * player karts to display a message to the player.
@ -637,6 +628,7 @@ void LinearWorld::updateRacePosition ( Kart* kart, KartInfo& kart_info )
void LinearWorld::checkForWrongDirection(unsigned int i) void LinearWorld::checkForWrongDirection(unsigned int i)
{ {
if(!m_kart[i]->isPlayerKart()) return; if(!m_kart[i]->isPlayerKart()) return;
if(!m_kart_info[i].m_on_road) return;
RaceGUI* m=menu_manager->getRaceMenu(); RaceGUI* m=menu_manager->getRaceMenu();
// This can happen if the option menu is called, since the // This can happen if the option menu is called, since the