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

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2016-05-02 22:27:25 +10:00
commit c1445386b2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/karts/controller/skidding_ai.cpp
View File

@ -1314,6 +1314,12 @@ void SkiddingAI::handleItems(const float dt)
bool fire_backwards = (m_kart_behind && m_kart_ahead &&
m_distance_behind < m_distance_ahead) ||
!m_kart_ahead;
// Don't fire if the kart we are aiming at is invulnerable.
if ((fire_backwards && m_kart_behind && m_kart_behind->isInvulnerable()) ||
(!fire_backwards && m_kart_ahead && m_kart_ahead->isInvulnerable()) )
return;
float distance = fire_backwards ? m_distance_behind
: m_distance_ahead;
m_controls->m_fire = ( (fire_backwards && distance < 30.0f) ||