diff options
Diffstat (limited to 'src')
5 files changed, 2 insertions, 24 deletions
diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index 87b49856b87..681cf05e272 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -33,18 +33,6 @@ void npc_escortAI::AttackStart(Unit *who) } } -void npc_escortAI::EnterCombat(Unit* pEnemy) -{ - if (!pEnemy) - return; - - Aggro(pEnemy); -} - -void npc_escortAI::Aggro(Unit* pEnemy) -{ -} - void npc_escortAI::MoveInLineOfSight(Unit *who) { if (IsBeingEscorted && !Attack) diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.h b/src/bindings/scripts/scripts/npc/npc_escortAI.h index 3f5af2e99d3..3431e84c6f8 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.h +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.h @@ -34,16 +34,12 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI // Pure Virtual Functions virtual void WaypointReached(uint32) = 0; - virtual void Aggro(Unit*); - // CreatureAI functions npc_escortAI(Creature *c) : ScriptedAI(c), IsBeingEscorted(false), PlayerTimer(1000), MaxPlayerDistance(DEFAULT_MAX_PLAYER_DISTANCE), CanMelee(true), DespawnAtEnd(true), DespawnAtFar(true) {} void AttackStart(Unit* who); - void EnterCombat(Unit*); - void MoveInLineOfSight(Unit* who); void JustRespawned(); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index 5fdb461a9b0..d23ab67d938 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI m_pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED); } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { DoScriptText(SAY_AGGRO, m_creature); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index 2ab878a5a72..4c25a037d2c 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI m_pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED); } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { DoScriptText(SAY_AGGRO, m_creature); @@ -255,8 +255,6 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit* pWho) {} - void MoveInLineOfSight(Unit* pWho) { if (!pWho || m_creature->getVictim()) diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index d1753d20960..d86a41990b9 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -96,8 +96,6 @@ struct TRINITY_DLL_DECL npc_bartlebyAI : public ScriptedAI AttackStart(pAttacker); } - void Aggro(Unit *who) { } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) { if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage)*100 / m_creature->GetMaxHealth() < 15)) @@ -163,8 +161,6 @@ struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI AttackStart(pAttacker); } - void Aggro(Unit *who) {} - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) { if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage)*100 / m_creature->GetMaxHealth() < 15)) |