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

fixed rescuing bugs with lap count (free laps or missing laps) hopefully for good this time. Instead of the previous weak implementation, which substracted laps, this time I just keep a variable of the lap number when the kart was last on a valid sector. Then on rescue I just set back this number of laps - I can't think of any way to trick this system.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2773 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2008-12-25 18:49:34 +00:00
parent 25fc6e5f07
commit f489ae57cd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modes/linear_world.cpp
View File

@ -48,6 +48,7 @@ void LinearWorld::init()
KartInfo info;
info.m_track_sector = Track::UNKNOWN_SECTOR;
info.m_last_valid_sector = Track::UNKNOWN_SECTOR;
info.m_last_valid_race_lap = -1;
info.m_lap_start_time = -1.0f;
m_track->findRoadSector(m_kart[n]->getXYZ(), &info.m_track_sector);
@ -160,7 +161,8 @@ void LinearWorld::update(float delta)
// bring karts back to where they left the track.
rescueKartAfterShortcut(kart, kart_info);
}
kart_info.m_last_valid_sector = kart_info.m_track_sector;
kart_info.m_last_valid_sector = kart_info.m_track_sector;
kart_info.m_last_valid_race_lap = kart_info.m_race_lap;
} // last_valid_sectpr!=UNKNOWN_SECTOR
else
{
@ -504,21 +506,13 @@ float LinearWorld::estimateFinishTimeForKart(Kart* kart)
*/
void LinearWorld::rescueKartAfterShortcut(Kart* kart, KartInfo& kart_info)
{
// Reset the kart to the segment where the shortcut started!! And then
// reset the shortcut flag, so that this shortcut is not counted!
const bool warp_around = kart_info.m_last_valid_sector == 0;
// Reset the kart to the segment where the shortcut started
// add one because 'moveKartAfterRescue' removes 1
kart_info.m_track_sector = kart_info.m_last_valid_sector+1;
// don't let kart get a new free lap cause he was dropped at begin line...
if(warp_around)
{
kart_info.m_race_lap--;
kart_info.m_lap_start_time = -1; // invalidate time so he doesn't get a best time
}
kart_info.m_race_lap = kart_info.m_last_valid_race_lap;
kart->doingShortcut();
kart->forceRescue();
} // rescueKartAfterShortcut
@ -537,7 +531,10 @@ void LinearWorld::moveKartAfterRescue(Kart* kart, btRigidBody* body)
// when hitting the books, press rescue --> you are rescued to the
// end of the track).
if(!info.m_on_road)
{
info.m_track_sector = info.m_last_valid_sector;
info.m_race_lap = info.m_last_valid_race_lap;
}
// FIXME - removing 1 here makes it less likely to fall in a rescue loop since the kart
// moves back on each attempt. This is still a weak hack. Also some other code depends
// on 1 being substracted, like 'forceRescue'

5
src/modes/linear_world.hpp
View File

@ -36,7 +36,10 @@ struct KartInfo
* estimated finishing time! */
int m_track_sector; /**<Index in driveline, special values
* e.g. UNKNOWN_SECTOR can be negative!*/
int m_last_valid_sector;
int m_last_valid_sector; /* used when rescusing, e.g. for invalid shortcuts */
int m_last_valid_race_lap; /* when a kart is rescued, we need to give it back the number of lap it had */
Vec3 m_curr_track_coords;
Vec3 m_last_track_coords;