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

Merge pull request #2725 from LoadingPleaseWait/ghost-slipstream

Browse Source 
No slipstream from ghost kart, fix #2721
This commit is contained in:
Benau 2017-01-05 16:23:18 +08:00 committed by GitHub
commit c7f9de3080
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/slip_stream.cpp
View File

@ -367,8 +367,9 @@ void SlipStream::update(float dt)
{ {
const KartProperties *kp = m_kart->getKartProperties(); const KartProperties *kp = m_kart->getKartProperties();
// Low level AIs should not do any slipstreaming. // Low level AIs and ghost karts should not do any slipstreaming.
if(m_kart->getController()->disableSlipstreamBonus()) if (m_kart->getController()->disableSlipstreamBonus()
|| m_kart->isGhostKart())
return; return;
MovingTexture::update(dt); MovingTexture::update(dt);
@ -411,9 +412,10 @@ void SlipStream::update(float dt)
{ {
m_target_kart= world->getKart(i); m_target_kart= world->getKart(i);
// Don't test for slipstream with itself, a kart that is being // Don't test for slipstream with itself, a kart that is being
// rescued or exploding, or an eliminated kart // rescued or exploding, a ghost kart or an eliminated kart
if(m_target_kart==m_kart || if(m_target_kart==m_kart ||
m_target_kart->getKartAnimation() || m_target_kart->getKartAnimation() ||
m_target_kart->isGhostKart() ||
m_target_kart->isEliminated() ) continue; m_target_kart->isEliminated() ) continue;
// Transform this kart location into target kart point of view // Transform this kart location into target kart point of view