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

Move the shield check for the swatter

Browse Source 
Reduce unnecessary computation and fix compilation
This commit is contained in:
Alayan-stk-2 2018-04-11 03:26:31 +02:00 committed by GitHub
parent 0025ef6305
commit 4496caeadf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/karts/controller/skidding_ai.cpp
View File

@ -1345,6 +1345,10 @@ void SkiddingAI::handleItems(const float dt, const Vec3 *aim_point, int last_nod
case PowerupManager::POWERUP_SWATTER:
{
// if the kart has a shield, do not break it by using a swatter.
if(m_kart->getShieldTime() > min_bubble_time)
break;
handleSwatter(item_skill);
break;
} // POWERUP_SWATTER
@ -1802,9 +1806,7 @@ void SkiddingAI::handleSwatter(int item_skill)
}
// Squared distance for which the swatter works
float d2 = m_kart->getKartProperties()->getSwatterDistance();
// if the kart has a shield, do not return it by using a swatter.
if(m_kart->getShieldTime() > min_bubble_time)
return;
// Fire if the closest kart ahead or to the back is not already
// squashed and close enough.
// FIXME: this can be improved on, since more than one kart might