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

Trigger rescue only when the kart is not on gravity terrain.

Browse Source
This commit is contained in:
hiker 2014-01-30 12:29:05 +11:00
parent c80a78dcf2
commit 8313bcb0d2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/karts/kart.cpp
View File

@ -1177,8 +1177,14 @@ void Kart::update(float dt)
m_skid_sound->position ( getXYZ() ); m_skid_sound->position ( getXYZ() );
m_boing_sound->position ( getXYZ() ); m_boing_sound->position ( getXYZ() );
// Check if a kart is (nearly) upside down and not moving much --> automatic rescue // Check if a kart is (nearly) upside down and not moving much -->
if(World::getWorld()->getTrack()->isAutoRescueEnabled() && // automatic rescue
// But only do this if auto-rescue is enabled (i.e. it will be disabled in
// battle mode), and the material the kart is driving on does not have
// gravity (which can
if(World::getWorld()->getTrack()->isAutoRescueEnabled() &&
(!m_terrain_info->getMaterial() ||
!m_terrain_info->getMaterial()->hasGravity()) &&
!getKartAnimation() && fabs(getRoll())>60*DEGREE_TO_RAD && !getKartAnimation() && fabs(getRoll())>60*DEGREE_TO_RAD &&
fabs(getSpeed())<3.0f ) fabs(getSpeed())<3.0f )
{ {