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

Tell the AI to not gift free nitro cans when a switch is active

Browse Source
This commit is contained in:
Alayan 2018-09-22 16:22:52 +02:00
parent c7ea40df6c
commit 63a377cf0b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/items/item_manager.hpp
View File

@ -135,6 +135,7 @@ public:
void reset (); void reset ();
virtual void collectedItem (Item *item, AbstractKart *kart); virtual void collectedItem (Item *item, AbstractKart *kart);
void switchItems (); void switchItems ();
bool areItemSwitched() { return (m_switch_ticks > 0); }
bool randomItemsForArena(const AlignedArray<btTransform>& pos); bool randomItemsForArena(const AlignedArray<btTransform>& pos);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** Only used in the NetworkItemManager. */ /** Only used in the NetworkItemManager. */

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

@ -1424,7 +1424,8 @@ void SkiddingAI::handleBubblegum(int item_skill, const std::vector<const Item *>
if (abs_angle < 0.2f) straight_behind = true; if (abs_angle < 0.2f) straight_behind = true;
} }
if(m_distance_behind < 8.0f && straight_behind ) if(m_distance_behind < 8.0f && straight_behind &&
(!ItemManager::get()->areItemSwitched() || item_skill < 4))
{ {
m_controls->setFire(true); m_controls->setFire(true);
m_controls->setLookBack(true); m_controls->setLookBack(true);