diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/base/escort_ai.cpp | 3 | ||||
| -rw-r--r-- | src/bindings/scripts/base/escort_ai.h | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/bindings/scripts/base/escort_ai.cpp b/src/bindings/scripts/base/escort_ai.cpp index a0d2d4a0d66..83075686c2d 100644 --- a/src/bindings/scripts/base/escort_ai.cpp +++ b/src/bindings/scripts/base/escort_ai.cpp @@ -21,7 +21,6 @@ enum ePoints npc_escortAI::npc_escortAI(Creature* pCreature) : ScriptedAI(pCreature), m_uiPlayerGUID(0), MaxPlayerDistance(DEFAULT_MAX_PLAYER_DISTANCE), - CanMelee(true), m_uiPlayerCheckTimer(1000), m_uiWPWaitTimer(2500), m_uiEscortState(STATE_ESCORT_NONE), @@ -303,7 +302,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff) void npc_escortAI::UpdateEscortAI(const uint32 uiDiff) { - if (!CanMelee && !UpdateVictim()) + if (!UpdateVictim()) return; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/base/escort_ai.h b/src/bindings/scripts/base/escort_ai.h index 37c2ea30117..2cf63b4a12d 100644 --- a/src/bindings/scripts/base/escort_ai.h +++ b/src/bindings/scripts/base/escort_ai.h @@ -76,7 +76,6 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI void SetMaxPlayerDistance(float newMax) { MaxPlayerDistance = newMax; } float GetMaxPlayerDistance() { return MaxPlayerDistance; } - void SetCanMelee(bool usemelee) { CanMelee = usemelee; } void SetDespawnAtEnd(bool despawn) { DespawnAtEnd = despawn; } void SetDespawnAtFar(bool despawn) { DespawnAtFar = despawn; } bool GetAttack() { return m_bIsActiveAttacker; }//used in EnterEvadeMode override @@ -109,7 +108,6 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI bool m_bIsRunning; //all creatures are walking by default (has flag MOVEMENTFLAG_WALK) bool m_bCanInstantRespawn; //if creature should respawn instantly after escort over (if not, database respawntime are used) bool m_bCanReturnToStart; //if creature can walk same path (loop) without despawn. Not for regular escort quests. - bool CanMelee; bool DespawnAtEnd; bool DespawnAtFar; bool ScriptWP; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp index ca7db6f2581..3757c753814 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp @@ -1138,7 +1138,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) { - CAST_AI(hyjal_trashAI, m_creature->AI())->SetCanMelee(false); + CAST_AI(hyjal_trashAI, m_creature->AI())->SetCanAttack(false); npc_escortAI::UpdateAI(diff); } if (IsEvent) @@ -1249,7 +1249,7 @@ struct mob_gargoyleAI : public hyjal_trashAI hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) { - CAST_AI(hyjal_trashAI, m_creature->AI())->SetCanMelee(false); + CAST_AI(hyjal_trashAI, m_creature->AI())->SetCanAttack(false); npc_escortAI::UpdateAI(diff); } if (IsEvent) |