From 2cffff301e8ba4c5952b35185814ece52a61bd26 Mon Sep 17 00:00:00 2001 From: Charles A Edwards Date: Thu, 1 Sep 2016 17:09:26 +0100 Subject: [PATCH] Correction made to function name Correction made to function name This bring Three inline with the other cores --- src/modules/Eluna/UnitMethods.h | 2 +- src/modules/SD3/base/escort_ai.cpp | 2 +- src/modules/SD3/base/follower_ai.cpp | 2 +- src/modules/SD3/base/pet_ai.cpp | 2 +- src/modules/SD3/include/sc_creature.cpp | 2 +- src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp | 4 ++-- src/modules/SD3/scripts/kalimdor/the_barrens.cpp | 4 ++-- .../auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/Eluna/UnitMethods.h b/src/modules/Eluna/UnitMethods.h index 3ecc30dc3..53464cc6f 100644 --- a/src/modules/Eluna/UnitMethods.h +++ b/src/modules/Eluna/UnitMethods.h @@ -105,7 +105,7 @@ namespace LuaUnit Creature* creature = Eluna::CHECKOBJ(L, 2); #ifndef TRINITY - Eluna::Push(L, unit->IsInAccessablePlaceFor(creature)); + Eluna::Push(L, unit->isInAccessablePlaceFor(creature)); #else Eluna::Push(L, unit->isInAccessiblePlaceFor(creature)); #endif diff --git a/src/modules/SD3/base/escort_ai.cpp b/src/modules/SD3/base/escort_ai.cpp index f2ed0ce1f..b4a069951 100644 --- a/src/modules/SD3/base/escort_ai.cpp +++ b/src/modules/SD3/base/escort_ai.cpp @@ -184,7 +184,7 @@ bool npc_escortAI::AssistPlayerInCombat(Unit* pWho) void npc_escortAI::MoveInLineOfSight(Unit* pWho) { - if (pWho->IsTargetableForAttack() && pWho->IsInAccessablePlaceFor(m_creature)) + if (pWho->IsTargetableForAttack() && pWho->isInAccessablePlaceFor(m_creature)) { // AssistPlayerInCombat can start attack, so return if true if (HasEscortState(STATE_ESCORT_ESCORTING) && AssistPlayerInCombat(pWho)) diff --git a/src/modules/SD3/base/follower_ai.cpp b/src/modules/SD3/base/follower_ai.cpp index 16581afdc..0dc514726 100644 --- a/src/modules/SD3/base/follower_ai.cpp +++ b/src/modules/SD3/base/follower_ai.cpp @@ -122,7 +122,7 @@ bool FollowerAI::AssistPlayerInCombat(Unit* pWho) void FollowerAI::MoveInLineOfSight(Unit* pWho) { - if (pWho->IsTargetableForAttack() && pWho->IsInAccessablePlaceFor(m_creature)) + if (pWho->IsTargetableForAttack() && pWho->isInAccessablePlaceFor(m_creature)) { // AssistPlayerInCombat can start attack, so return if true if (HasFollowState(STATE_FOLLOW_INPROGRESS) && AssistPlayerInCombat(pWho)) diff --git a/src/modules/SD3/base/pet_ai.cpp b/src/modules/SD3/base/pet_ai.cpp index aa0ebe7f1..6db6dec65 100644 --- a/src/modules/SD3/base/pet_ai.cpp +++ b/src/modules/SD3/base/pet_ai.cpp @@ -56,7 +56,7 @@ void ScriptedPetAI::MoveInLineOfSight(Unit* pWho) } if (m_creature->CanInitiateAttack() && pWho->IsTargetableForAttack() && - m_creature->IsHostileTo(pWho) && pWho->IsInAccessablePlaceFor(m_creature)) + m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature)) { if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) { diff --git a/src/modules/SD3/include/sc_creature.cpp b/src/modules/SD3/include/sc_creature.cpp index 6b207caad..647cf12a0 100644 --- a/src/modules/SD3/include/sc_creature.cpp +++ b/src/modules/SD3/include/sc_creature.cpp @@ -75,7 +75,7 @@ bool ScriptedAI::IsVisible(Unit* pWho) const void ScriptedAI::MoveInLineOfSight(Unit* pWho) { if (m_creature->CanInitiateAttack() && pWho->IsTargetableForAttack() && - m_creature->IsHostileTo(pWho) && pWho->IsInAccessablePlaceFor(m_creature)) + m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature)) { if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) { diff --git a/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp b/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp index 2b4a3470d..becf92a8d 100644 --- a/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp +++ b/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp @@ -58,14 +58,14 @@ struct npc_ragged_john : public CreatureScript { if (who->HasAura(16468, EFFECT_INDEX_0)) { - if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->IsInAccessablePlaceFor(m_creature)) + if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessablePlaceFor(m_creature)) { DoCastSpellIfCan(who, 16472); ((Player*)who)->AreaExploredOrEventHappens(4866); } } - if (!m_creature->getVictim() && who->IsTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->IsInAccessablePlaceFor(m_creature)) + if (!m_creature->getVictim() && who->IsTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessablePlaceFor(m_creature)) { if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) { diff --git a/src/modules/SD3/scripts/kalimdor/the_barrens.cpp b/src/modules/SD3/scripts/kalimdor/the_barrens.cpp index 9345b391b..ac4f69999 100644 --- a/src/modules/SD3/scripts/kalimdor/the_barrens.cpp +++ b/src/modules/SD3/scripts/kalimdor/the_barrens.cpp @@ -1244,7 +1244,7 @@ struct horde_defender : public CreatureScript void MoveInLineOfSight(Unit* u) override { if (m_creature->CanInitiateAttack() && u->IsTargetableForAttack() && - m_creature->IsHostileTo(u) && u->IsInAccessablePlaceFor(m_creature)) + m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature)) { float attackRadius = 38.0f; if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u)) @@ -1327,7 +1327,7 @@ struct kolkar_invader : public CreatureScript void MoveInLineOfSight(Unit* u) override { if (m_creature->CanInitiateAttack() && u->IsTargetableForAttack() && - m_creature->IsHostileTo(u) && u->IsInAccessablePlaceFor(m_creature)) + m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature)) { float attackRadius = 38.0f; if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u)) diff --git a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp index ee7485ee0..7213a5e61 100644 --- a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp +++ b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp @@ -100,7 +100,7 @@ struct boss_talon_king_ikiss : public CreatureScript void MoveInLineOfSight(Unit* pWho) override { - if (!m_creature->getVictim() && pWho->IsTargetableForAttack() && (m_creature->IsHostileTo(pWho)) && pWho->IsInAccessablePlaceFor(m_creature)) + if (!m_creature->getVictim() && pWho->IsTargetableForAttack() && (m_creature->IsHostileTo(pWho)) && pWho->isInAccessablePlaceFor(m_creature)) { if (!m_bIntro && m_creature->IsWithinDistInMap(pWho, 100.0f)) {