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

Don't show jump animation during rescue

Browse Source
This commit is contained in:
Deve
2014-11-03 13:32:23 +01:00
parent 18bcb92afc
commit 01a7094cd8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/karts/kart.cpp
View File

@@ -1329,7 +1329,7 @@ void Kart::update(float dt)
// is rescued isOnGround might still be true, since the kart rigid
// body was removed from the physics, but still retain the old
// values for the raycasts).
if (!isOnGround())
if (!isOnGround() && !getKartAnimation())
{
const Material *m = getMaterial();
const Material *last_m = getLastMaterial();
@@ -1359,11 +1359,15 @@ void Kart::update(float dt)
{
// Kart touched ground again
m_is_jumping = false;
HitEffect *effect = new Explosion(getXYZ(), "jump",
"jump_explosion.xml");
projectile_manager->addHitEffect(effect);
m_kart_model->setAnimation(KartModel::AF_DEFAULT);
m_jump_time = 0;
if (!getKartAnimation())
{
HitEffect *effect = new Explosion(getXYZ(), "jump",
"jump_explosion.xml");
projectile_manager->addHitEffect(effect);
}
}
//const bool dyn_shadows = World::getWorld()->getTrack()->hasShadows() &&