diff --git a/src/game/Object/AggressorAI.cpp b/src/game/Object/AggressorAI.cpp index 9b77956d1..9cbfff38b 100644 --- a/src/game/Object/AggressorAI.cpp +++ b/src/game/Object/AggressorAI.cpp @@ -55,7 +55,7 @@ AggressorAI::MoveInLineOfSight(Unit* u) return; if (m_creature->CanInitiateAttack() && u->IsTargetableForAttack() && - m_creature->IsHostileTo(u) && u->IsInAccessablePlaceFor(m_creature)) + m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature)) { float attackRadius = m_creature->GetAttackDistance(u); if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u)) diff --git a/src/game/Object/Creature.cpp b/src/game/Object/Creature.cpp index b81ec7a0b..eb24a81dc 100644 --- a/src/game/Object/Creature.cpp +++ b/src/game/Object/Creature.cpp @@ -2092,7 +2092,7 @@ bool Creature::IsOutOfThreatArea(Unit* pVictim) const if (!pVictim->IsTargetableForAttack()) return true; - if (!pVictim->IsInAccessablePlaceFor(this)) + if (!pVictim->isInAccessablePlaceFor(this)) return true; if (!pVictim->IsVisibleForOrDetect(this, this, false)) diff --git a/src/game/Object/CreatureEventAI.cpp b/src/game/Object/CreatureEventAI.cpp index 9089fbf70..09edbb3c7 100644 --- a/src/game/Object/CreatureEventAI.cpp +++ b/src/game/Object/CreatureEventAI.cpp @@ -1270,7 +1270,7 @@ void CreatureEventAI::MoveInLineOfSight(Unit* who) return; if (m_creature->CanInitiateAttack() && who->IsTargetableForAttack() && - m_creature->IsHostileTo(who) && who->IsInAccessablePlaceFor(m_creature)) + m_creature->IsHostileTo(who) && who->isInAccessablePlaceFor(m_creature)) { if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; diff --git a/src/game/Object/GuardAI.cpp b/src/game/Object/GuardAI.cpp index 301d14a07..2a45cd0a9 100644 --- a/src/game/Object/GuardAI.cpp +++ b/src/game/Object/GuardAI.cpp @@ -48,7 +48,7 @@ void GuardAI::MoveInLineOfSight(Unit* u) if (!m_creature->getVictim() && u->IsTargetableForAttack() && (u->IsHostileToPlayers() || m_creature->IsHostileTo(u) /*|| u->getVictim() && m_creature->IsFriendlyTo(u->getVictim())*/) && - u->IsInAccessablePlaceFor(m_creature)) + u->isInAccessablePlaceFor(m_creature)) { float attackRadius = m_creature->GetAttackDistance(u); if (m_creature->IsWithinDistInMap(u, attackRadius)) diff --git a/src/game/Object/PetAI.cpp b/src/game/Object/PetAI.cpp index 541f9ea3e..3e92e29d1 100644 --- a/src/game/Object/PetAI.cpp +++ b/src/game/Object/PetAI.cpp @@ -60,7 +60,7 @@ void PetAI::MoveInLineOfSight(Unit* u) return; if (u->IsTargetableForAttack() && m_creature->IsHostileTo(u) && - u->IsInAccessablePlaceFor(m_creature)) + u->isInAccessablePlaceFor(m_creature)) { float attackRadius = m_creature->GetAttackDistance(u); if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->GetDistanceZ(u) <= CREATURE_Z_ATTACK_RANGE) diff --git a/src/game/Object/Unit.cpp b/src/game/Object/Unit.cpp index b79977f72..5f2803b79 100644 --- a/src/game/Object/Unit.cpp +++ b/src/game/Object/Unit.cpp @@ -4033,7 +4033,7 @@ void Unit::SetFacingToObject(WorldObject* pObject) SetFacingTo(GetAngle(pObject)); } -bool Unit::IsInAccessablePlaceFor(Creature const* c) const +bool Unit::isInAccessablePlaceFor(Creature const* c) const { if (IsInWater()) return c->CanSwim(); @@ -9545,7 +9545,7 @@ bool Unit::SelectHostileTarget() for (AuraList::const_reverse_iterator aura = tauntAuras.rbegin(); aura != tauntAuras.rend(); ++aura) { if ((caster = (*aura)->GetCaster()) && caster->IsInMap(this) && - caster->IsTargetableForAttack() && caster->IsInAccessablePlaceFor((Creature*)this) && + caster->IsTargetableForAttack() && caster->isInAccessablePlaceFor((Creature*)this) && !IsSecondChoiceTarget(caster, true)) { target = caster; @@ -9608,7 +9608,7 @@ bool Unit::SelectHostileTarget() { for (AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr) { - if ((*itr)->IsInMap(this) && (*itr)->IsTargetableForAttack() && (*itr)->IsInAccessablePlaceFor((Creature*)this)) + if ((*itr)->IsInMap(this) && (*itr)->IsTargetableForAttack() && (*itr)->isInAccessablePlaceFor((Creature*)this)) return false; } } diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h index bc6d61ced..96a0b9de9 100644 --- a/src/game/Object/Unit.h +++ b/src/game/Object/Unit.h @@ -2415,9 +2415,9 @@ class Unit : public WorldObject * accessible. * @param c The \ref Creature to check accessibility for * @return true if this \ref Unit is accessible to the \ref Creature given, false otherwise - * \todo Rename to IsInAccessablePlaceFor to follow standards? + * \todo Rename to isInAccessablePlaceFor to follow standards? */ - bool IsInAccessablePlaceFor(Creature const* c) const; + bool isInAccessablePlaceFor(Creature const* c) const; void SendHealSpellLog(Unit* pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical = false, uint32 absorb = 0); void SendEnergizeSpellLog(Unit* pVictim, uint32 SpellID, uint32 Damage, Powers powertype); diff --git a/src/game/References/ThreatManager.cpp b/src/game/References/ThreatManager.cpp index 52b8f2122..61bf55ca1 100644 --- a/src/game/References/ThreatManager.cpp +++ b/src/game/References/ThreatManager.cpp @@ -148,7 +148,7 @@ void HostileReference::updateOnlineStatus() !getTarget()->IsTaxiFlying())) { Creature* creature = (Creature*) getSourceUnit(); - online = getTarget()->IsInAccessablePlaceFor(creature); + online = getTarget()->isInAccessablePlaceFor(creature); if (!online) { if (creature->AI()->canReachByRangeAttack(getTarget()))