diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/Behaviors/BehaviorAggressive.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/Mobs/Behaviors/BehaviorAggressive.cpp b/src/Mobs/Behaviors/BehaviorAggressive.cpp index 2113cb1e6..b2c7cc9ef 100644 --- a/src/Mobs/Behaviors/BehaviorAggressive.cpp +++ b/src/Mobs/Behaviors/BehaviorAggressive.cpp @@ -10,23 +10,22 @@ cBehaviorAggressive::cBehaviorAggressive(cMonster * a_Parent) : m_Parent(a_Parent) { - ASSERT(m_Parent != nullptr); - m_ParentChaser = m_Parent->GetBehaviorChaser(); - ASSERT(m_ParentChaser != nullptr); + ASSERT(m_Parent != nullptr); + m_ParentChaser = m_Parent->GetBehaviorChaser(); + ASSERT(m_ParentChaser != nullptr); } -bool cBehaviorAggressive::ActiveTick() +void cBehaviorAggressive::PreTick() { - // Target something new if we have no target - if (m_ParentChaser->GetTarget() == nullptr) - { - m_ParentChaser->SetTarget(FindNewTarget()); - } - return false; + // Target something new if we have no target + if (m_ParentChaser->GetTarget() == nullptr) + { + m_ParentChaser->SetTarget(FindNewTarget()); + } } @@ -35,7 +34,7 @@ bool cBehaviorAggressive::ActiveTick() void cBehaviorAggressive::Destroyed() { - m_Target = nullptr; + m_ParentChaser->SetTarget(nullptr); } @@ -44,6 +43,6 @@ void cBehaviorAggressive::Destroyed() cPawn * cBehaviorAggressive::FindNewTarget() { - cPlayer * Closest = m_Parent->GetNearestPlayer(); - return Closest; // May be null + cPlayer * Closest = m_Parent->GetNearestPlayer(); + return Closest; // May be null } |