aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/AI/CoreAI/ReactorAI.cpp12
-rw-r--r--src/server/game/AI/CoreAI/ReactorAI.h7
-rw-r--r--src/server/game/AI/CoreAI/UnitAI.cpp5
3 files changed, 17 insertions, 7 deletions
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index fef465d592c..b9c235176bc 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -23,12 +23,18 @@
#include "ObjectAccessor.h"
#include "CreatureAIImpl.h"
-// #define REACTOR_VISIBLE_RANGE (26.46f) - It has not any use at all
-
int ReactorAI::Permissible(const Creature* creature)
{
if (creature->isCivilian() || creature->IsNeutralToAll())
return PERMIT_BASE_REACTIVE;
return PERMIT_BASE_NO;
-} \ No newline at end of file
+}
+
+void ReactorAI::UpdateAI(uint32 const /*diff*/)
+{
+ if (!UpdateVictim())
+ return;
+
+ DoMeleeAttackIfReady();
+}
diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h
index 6f4d704f755..e6db46bf38e 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.h
+++ b/src/server/game/AI/CoreAI/ReactorAI.h
@@ -19,17 +19,18 @@
#ifndef TRINITY_REACTORAI_H
#define TRINITY_REACTORAI_H
-#include "CombatAI.h"
+#include "CreatureAI.h"
class Unit;
-class ReactorAI : public AggressorAI
+class ReactorAI : public CreatureAI
{
public:
explicit ReactorAI(Creature* c) : AggressorAI(c) {}
- void MoveInLineOfSight(Unit*) {};
+ void MoveInLineOfSight(Unit*) {}
+ void UpdateAI(uint32 const diff);
static int Permissible(const Creature*);
};
diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp
index 0d2f623fd9e..7f0d387c2f1 100644
--- a/src/server/game/AI/CoreAI/UnitAI.cpp
+++ b/src/server/game/AI/CoreAI/UnitAI.cpp
@@ -238,7 +238,10 @@ void UnitAI::FillAISpellInfo()
}
//Enable PlayerAI when charmed
-void PlayerAI::OnCharmed(bool apply) { me->IsAIEnabled = apply; }
+void PlayerAI::OnCharmed(bool apply)
+{
+ me->IsAIEnabled = apply;
+}
void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/)
{