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

When skipping segments (triggering a shortcut message), the

Browse Source 
karts now gets automatically rescued.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1154 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hiker 2007-06-15 01:59:33 +00:00
parent 803db6bfb6
commit 4403a3eb35
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kart.cpp
View File

@ -674,23 +674,33 @@ void Kart::update (float dt)
doObjectInteractions();
// Save the last valid sector for forced rescue on shortcuts
if(m_track_sector != Track::UNKNOWN_SECTOR &&
!m_rescue )
{
m_shortcut_sector = m_track_sector;
}
int prev_sector = m_track_sector;
world->m_track->findRoadSector(m_curr_pos.xyz, &m_track_sector);
if(!m_rescue)
world->m_track->findRoadSector(m_curr_pos.xyz, &m_track_sector);
// Check if the kart is taking a shortcut (if it's not already doing one):
if(m_shortcut_type!=SC_SKIPPED_SECTOR)
if(m_shortcut_type!=SC_SKIPPED_SECTOR && !m_rescue)
{
if(world->m_track->isShortcut(prev_sector, m_track_sector))
{
m_shortcut_sector = prev_sector;
// Skipped sectors are more severe then getting outside the
// road, so count this as two. But if the kart is already
// outside the track, only one is added (since the outside
// track shortcut already added 1).
// This gets subtracted again when doing the rescue
m_shortcut_count+= m_shortcut_type==SC_NONE ? 2 : 1;
m_shortcut_type = SC_SKIPPED_SECTOR;
if(isPlayerKart())
{
forceRescue(); // bring karts back to where they left the track.
RaceGUI* m=(RaceGUI*)menu_manager->getRaceMenu();
// Can happen if the option menu is called
if(m)
@ -705,7 +715,7 @@ void Kart::update (float dt)
m_shortcut_type=SC_NONE;
}
if (m_track_sector == Track::UNKNOWN_SECTOR )
if (m_track_sector == Track::UNKNOWN_SECTOR && !m_rescue)
{
m_on_road = false;
if( m_curr_track_coords[0] > 0.0 )