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

fixed shortcut detection

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2312 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2008-09-30 01:54:09 +00:00
parent 04c106843a
commit 0765e643cf
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modes/linear_world.cpp
View File

@ -40,8 +40,8 @@ LinearWorld::LinearWorld() : World()
{
KartInfo info;
info.m_track_sector = Track::UNKNOWN_SECTOR;
info.m_last_valid_sector = Track::UNKNOWN_SECTOR;
info.m_lap_start_time = -1.0f;
info.m_shortcut_sector = Track::UNKNOWN_SECTOR;
RaceManager::getTrack()->findRoadSector(m_kart[n]->getXYZ(), &info.m_track_sector);
//If m_track_sector == UNKNOWN_SECTOR, then the kart is not on top of
@ -81,8 +81,8 @@ void LinearWorld::restartRace()
{
KartInfo& info = m_kart_info[n];
info.m_track_sector = Track::UNKNOWN_SECTOR;
info.m_last_valid_sector = Track::UNKNOWN_SECTOR;
info.m_lap_start_time = -1.0f;
info.m_shortcut_sector = Track::UNKNOWN_SECTOR;
RaceManager::getTrack()->findRoadSector(m_kart[n]->getXYZ(), &info.m_track_sector);
//If m_track_sector == UNKNOWN_SECTOR, then the kart is not on top of
@ -129,11 +129,8 @@ void LinearWorld::update(float delta)
for(unsigned int n=0; n<kart_amount; n++)
{
KartInfo& kart_info = m_kart_info[n];
Kart* kart = m_kart[n];
// ---------- update rank ------
if(!m_kart[n]->hasFinishedRace()) updateRacePosition(kart, kart_info);
if(!m_kart[n]->hasFinishedRace()) updateRacePosition(m_kart[n], m_kart_info[n]);
}
for(unsigned int n=0; n<kart_amount; n++)
{
@ -141,19 +138,16 @@ void LinearWorld::update(float delta)
Kart* kart = m_kart[n];
// ---------- deal with sector data ---------
// Save the last valid sector for forced rescue on shortcuts
if(kart_info.m_track_sector != Track::UNKNOWN_SECTOR &&
!kart->isRescue() )
{
kart_info.m_shortcut_sector = kart_info.m_track_sector;
}
// update sector variables
int prev_sector = kart_info.m_track_sector;
if(!kart->isRescue())
RaceManager::getTrack()->findRoadSector( kart->getXYZ(), &kart_info.m_track_sector);
// Check if the kart is taking a shortcut (if it's not already doing one):
if(!kart->isRescue() && RaceManager::getTrack()->isShortcut(prev_sector, kart_info.m_track_sector))
if(!kart->isRescue() && kart_info.m_last_valid_sector != Track::UNKNOWN_SECTOR &&
RaceManager::getTrack()->isShortcut(kart_info.m_last_valid_sector, kart_info.m_track_sector))
{
forceRescue(kart, kart_info, /*is shortcut*/ true); // bring karts back to where they left the track.
if(kart->isPlayerKart())
@ -166,6 +160,9 @@ void LinearWorld::update(float delta)
return;
}
if(kart_info.m_track_sector != Track::UNKNOWN_SECTOR && !kart->isRescue()) kart_info.m_last_valid_sector = kart_info.m_track_sector;
// check if kart is on the road - if not, find the closest sector
if (kart_info.m_track_sector == Track::UNKNOWN_SECTOR && !kart->isRescue())
{
kart_info.m_on_road = false;
@ -185,6 +182,7 @@ void LinearWorld::update(float delta)
kart_info.m_on_road = true;
}
// get position (progression) within track
RaceManager::getTrack()->spatialToTrack( kart_info.m_curr_track_coords /* out */,
kart->getXYZ(),
kart_info.m_track_sector );
@ -454,7 +452,7 @@ void LinearWorld::forceRescue(Kart* kart, KartInfo& kart_info, bool shortcut)
// flag, so that this shortcut is not counted!
if(shortcut)
{
kart_info.m_track_sector = kart_info.m_shortcut_sector;
kart_info.m_track_sector = kart_info.m_last_valid_sector;
}
kart->forceRescue();

2
src/modes/linear_world.hpp
View File

@ -32,9 +32,9 @@ struct KartInfo
int m_race_lap; // number of finished(!) laps
float m_time_at_last_lap; // time at finishing last lap
float m_lap_start_time; // Time at start of a new lap
int m_shortcut_sector; // segment on which the shortcut was started
int m_track_sector; // index in driveline, special values
// e.g. UNKNOWN_SECTOR can be negative!
int m_last_valid_sector;
Vec3 m_curr_track_coords;
Vec3 m_last_track_coords;

16
src/modes/world.cpp
View File

@ -326,21 +326,21 @@ void World::updateHighscores()
for(unsigned int pos=0; pos<kart_amount; pos++)
{
#ifdef DEBUG
// FIXME begin: triggered if the positions of the karts are incorrect:
if(index[pos]<0)
if(index[pos] == 999)
{
// no kart claimed to be in this position, most likely means
// the kart location data is wrong
#ifdef DEBUG
fprintf(stderr, "Error, incorrect kart positions:");
for (unsigned int i=0; i<m_kart.size(); i++ )
{
fprintf(stderr, "i=%d position %d\n",i, m_kart[i]->getPosition());
}
}
#endif
// no kart claimed to be in this position
// FIXME - find why after some race resets kart positions are messed up
if(index[pos] == 999) continue;
continue;
}
// Only record times for player karts
if(!m_kart[index[pos]]->isPlayerKart()) continue;