diff options
Diffstat (limited to 'src')
482 files changed, 3216 insertions, 2997 deletions
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index f835533d322..85dd9cca90c 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -26,7 +26,7 @@ int AggressorAI::Permissible(const Creature* creature) { // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight - if (!creature->isCivilian() && !creature->IsNeutralToAll()) + if (!creature->IsCivilian() && !creature->IsNeutralToAll()) return PERMIT_BASE_PROACTIVE; return PERMIT_BASE_NO; @@ -164,7 +164,7 @@ void CasterAI::UpdateAI(uint32 diff) events.Update(diff); - if (me->getVictim()->HasBreakableByDamageCrowdControlAura(me)) + if (me->GetVictim()->HasBreakableByDamageCrowdControlAura(me)) { me->InterruptNonMeleeSpells(false); return; @@ -224,7 +224,7 @@ void ArcherAI::UpdateAI(uint32 /*diff*/) if (!UpdateVictim()) return; - if (!me->IsWithinCombatRange(me->getVictim(), m_minRange)) + if (!me->IsWithinCombatRange(me->GetVictim(), m_minRange)) DoSpellAttackIfReady(me->m_spells[0]); else DoMeleeAttackIfReady(); @@ -248,8 +248,8 @@ TurretAI::TurretAI(Creature* c) : CreatureAI(c) bool TurretAI::CanAIAttack(const Unit* /*who*/) const { /// @todo use one function to replace it - if (!me->IsWithinCombatRange(me->getVictim(), me->m_CombatDistance) - || (m_minRange && me->IsWithinCombatRange(me->getVictim(), m_minRange))) + if (!me->IsWithinCombatRange(me->GetVictim(), me->m_CombatDistance) + || (m_minRange && me->IsWithinCombatRange(me->GetVictim(), m_minRange))) return false; return true; } diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 1da190a86a8..220d53a20e0 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -25,7 +25,7 @@ int GuardAI::Permissible(Creature const* creature) { - if (creature->isGuard()) + if (creature->IsGuard()) return PERMIT_BASE_SPECIAL; return PERMIT_BASE_NO; @@ -50,7 +50,7 @@ bool GuardAI::CanSeeAlways(WorldObject const* obj) void GuardAI::EnterEvadeMode() { - if (!me->isAlive()) + if (!me->IsAlive()) { me->GetMotionMaster()->MoveIdle(); me->CombatStop(true); diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp index 187a72bae92..e3f852d08eb 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -26,7 +26,7 @@ NullCreatureAI::NullCreatureAI(Creature* c) : CreatureAI(c) { me->SetReactState( void PassiveAI::UpdateAI(uint32) { - if (me->isInCombat() && me->getAttackers().empty()) + if (me->IsInCombat() && me->getAttackers().empty()) EnterEvadeMode(); } @@ -37,9 +37,9 @@ void PossessedAI::AttackStart(Unit* target) void PossessedAI::UpdateAI(uint32 /*diff*/) { - if (me->getVictim()) + if (me->GetVictim()) { - if (!me->IsValidAttackTarget(me->getVictim())) + if (!me->IsValidAttackTarget(me->GetVictim())) me->AttackStop(); else DoMeleeAttackIfReady(); diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index be215d956b2..2a13e5c71bf 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -32,7 +32,7 @@ int PetAI::Permissible(const Creature* creature) { - if (creature->isPet()) + if (creature->IsPet()) return PERMIT_BASE_SPECIAL; return PERMIT_BASE_NO; @@ -46,15 +46,15 @@ PetAI::PetAI(Creature* c) : CreatureAI(c), i_tracker(TIME_INTERVAL_LOOK) bool PetAI::_needToStop() { // This is needed for charmed creatures, as once their target was reset other effects can trigger threat - if (me->isCharmed() && me->getVictim() == me->GetCharmer()) + if (me->IsCharmed() && me->GetVictim() == me->GetCharmer()) return true; - return !me->IsValidAttackTarget(me->getVictim()); + return !me->IsValidAttackTarget(me->GetVictim()); } void PetAI::_stopAttack() { - if (!me->isAlive()) + if (!me->IsAlive()) { TC_LOG_DEBUG(LOG_FILTER_GENERAL, "Creature stoped attacking cuz his dead [guid=%u]", me->GetGUIDLow()); me->GetMotionMaster()->Clear(); @@ -75,7 +75,7 @@ void PetAI::_stopAttack() void PetAI::UpdateAI(uint32 diff) { - if (!me->isAlive() || !me->GetCharmInfo()) + if (!me->IsAlive() || !me->GetCharmInfo()) return; Unit* owner = me->GetCharmerOrOwner(); @@ -86,10 +86,10 @@ void PetAI::UpdateAI(uint32 diff) else m_updateAlliesTimer -= diff; - if (me->getVictim() && me->getVictim()->isAlive()) + if (me->GetVictim() && me->GetVictim()->IsAlive()) { // is only necessary to stop casting, the pet must not exit combat - if (me->getVictim()->HasBreakableByDamageCrowdControlAura(me)) + if (me->GetVictim()->HasBreakableByDamageCrowdControlAura(me)) { me->InterruptNonMeleeSpells(false); return; @@ -105,7 +105,7 @@ void PetAI::UpdateAI(uint32 diff) // Check before attacking to prevent pets from leaving stay position if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY)) { - if (me->GetCharmInfo()->IsCommandAttack() || (me->GetCharmInfo()->IsAtStay() && me->IsWithinMeleeRange(me->getVictim()))) + if (me->GetCharmInfo()->IsCommandAttack() || (me->GetCharmInfo()->IsAtStay() && me->IsWithinMeleeRange(me->GetVictim()))) DoMeleeAttackIfReady(); } else @@ -159,7 +159,7 @@ void PetAI::UpdateAI(uint32 diff) continue; // Check if we're in combat or commanded to attack - if (!me->isInCombat() && !me->GetCharmInfo()->IsCommandAttack()) + if (!me->IsInCombat() && !me->GetCharmInfo()->IsCommandAttack()) continue; } @@ -208,11 +208,11 @@ void PetAI::UpdateAI(uint32 diff) if (!spellUsed) delete spell; } - else if (me->getVictim() && CanAttack(me->getVictim()) && spellInfo->CanBeUsedInCombat()) + else if (me->GetVictim() && CanAttack(me->GetVictim()) && spellInfo->CanBeUsedInCombat()) { Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE, 0); - if (spell->CanAutoCast(me->getVictim())) - targetSpellStore.push_back(std::make_pair(me->getVictim(), spell)); + if (spell->CanAutoCast(me->GetVictim())) + targetSpellStore.push_back(std::make_pair(me->GetVictim(), spell)); else delete spell; } @@ -284,7 +284,7 @@ void PetAI::UpdateAllies() { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* Target = itr->getSource(); + Player* Target = itr->GetSource(); if (!Target || !group->SameSubGroup((Player*)owner, Target)) continue; @@ -302,7 +302,7 @@ void PetAI::KilledUnit(Unit* victim) { // Called from Unit::Kill() in case where pet or owner kills something // if owner killed this victim, pet may still be attacking something else - if (me->getVictim() && me->getVictim() != victim) + if (me->GetVictim() && me->GetVictim() != victim) return; // Clear target just in case. May help problem where health / focus / mana @@ -345,7 +345,7 @@ void PetAI::OwnerAttackedBy(Unit* attacker) return; // Prevent pet from disengaging from current target - if (me->getVictim() && me->getVictim()->isAlive()) + if (me->GetVictim() && me->GetVictim()->IsAlive()) return; // Continue to evaluate and attack if necessary @@ -366,7 +366,7 @@ void PetAI::OwnerAttacked(Unit* target) return; // Prevent pet from disengaging from current target - if (me->getVictim() && me->getVictim()->isAlive()) + if (me->GetVictim() && me->GetVictim()->IsAlive()) return; // Continue to evaluate and attack if necessary @@ -400,7 +400,7 @@ Unit* PetAI::SelectNextTarget(bool allowAutoSelect) const // Check owner victim // 3.0.2 - Pets now start attacking their owners victim in defensive mode as soon as the hunter does - if (Unit* ownerVictim = me->GetCharmerOrOwner()->getVictim()) + if (Unit* ownerVictim = me->GetCharmerOrOwner()->GetVictim()) return ownerVictim; // Neither pet or owner had a target and aggressive pets can pick any target @@ -423,7 +423,7 @@ void PetAI::HandleReturnMovement() // Prevent activating movement when under control of spells // such as "Eyes of the Beast" - if (me->isCharmed()) + if (me->IsCharmed()) return; if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY)) @@ -527,7 +527,7 @@ bool PetAI::CanAttack(Unit* target) if (!target) return false; - if (!target->isAlive()) + if (!target->IsAlive()) { // Clear target to prevent getting stuck on dead targets me->AttackStop(); @@ -553,14 +553,14 @@ bool PetAI::CanAttack(Unit* target) return (me->IsWithinMeleeRange(target) || me->GetCharmInfo()->IsCommandAttack()); // Pets attacking something (or chasing) should only switch targets if owner tells them to - if (me->getVictim() && me->getVictim() != target) + if (me->GetVictim() && me->GetVictim() != target) { // Check if our owner selected this target and clicked "attack" Unit* ownerTarget = NULL; if (Player* owner = me->GetCharmerOrOwner()->ToPlayer()) ownerTarget = owner->GetSelectedUnit(); else - ownerTarget = me->GetCharmerOrOwner()->getVictim(); + ownerTarget = me->GetCharmerOrOwner()->GetVictim(); if (ownerTarget && me->GetCharmInfo()->IsCommandAttack()) return (target->GetGUID() == ownerTarget->GetGUID()); @@ -580,19 +580,19 @@ void PetAI::ReceiveEmote(Player* player, uint32 emote) switch (emote) { case TEXT_EMOTE_COWER: - if (me->isPet() && me->ToPet()->IsPetGhoul()) + if (me->IsPet() && me->ToPet()->IsPetGhoul()) me->HandleEmoteCommand(/*EMOTE_ONESHOT_ROAR*/EMOTE_ONESHOT_OMNICAST_GHOUL); break; case TEXT_EMOTE_ANGRY: - if (me->isPet() && me->ToPet()->IsPetGhoul()) + if (me->IsPet() && me->ToPet()->IsPetGhoul()) me->HandleEmoteCommand(/*EMOTE_ONESHOT_COWER*/EMOTE_STATE_STUN); break; case TEXT_EMOTE_GLARE: - if (me->isPet() && me->ToPet()->IsPetGhoul()) + if (me->IsPet() && me->ToPet()->IsPetGhoul()) me->HandleEmoteCommand(EMOTE_STATE_STUN); break; case TEXT_EMOTE_SOOTHE: - if (me->isPet() && me->ToPet()->IsPetGhoul()) + if (me->IsPet() && me->ToPet()->IsPetGhoul()) me->HandleEmoteCommand(EMOTE_ONESHOT_OMNICAST_GHOUL); break; } @@ -627,7 +627,7 @@ void PetAI::AttackedBy(Unit* attacker) return; // Prevent pet from disengaging from current target - if (me->getVictim() && me->getVictim()->isAlive()) + if (me->GetVictim() && me->GetVictim()->IsAlive()) return; // Continue to evaluate and attack if necessary diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp index b99885088d4..d749ce91c05 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -25,7 +25,7 @@ int ReactorAI::Permissible(const Creature* creature) { - if (creature->isCivilian() || creature->IsNeutralToAll()) + if (creature->IsCivilian() || creature->IsNeutralToAll()) return PERMIT_BASE_REACTIVE; return PERMIT_BASE_NO; diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 45865c5dbc2..d8644c50b35 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -29,7 +29,7 @@ int TotemAI::Permissible(Creature const* creature) { - if (creature->isTotem()) + if (creature->IsTotem()) return PERMIT_BASE_PROACTIVE; return PERMIT_BASE_NO; @@ -37,7 +37,7 @@ int TotemAI::Permissible(Creature const* creature) TotemAI::TotemAI(Creature* c) : CreatureAI(c), i_victimGuid(0) { - ASSERT(c->isTotem()); + ASSERT(c->IsTotem()); } void TotemAI::MoveInLineOfSight(Unit* /*who*/) @@ -54,7 +54,7 @@ void TotemAI::UpdateAI(uint32 /*diff*/) if (me->ToTotem()->GetTotemType() != TOTEM_ACTIVE) return; - if (!me->isAlive() || me->IsNonMeleeSpellCasted(false)) + if (!me->IsAlive() || me->IsNonMeleeSpellCasted(false)) return; // Search spell @@ -73,7 +73,7 @@ void TotemAI::UpdateAI(uint32 /*diff*/) // Search victim if no, not attackable, or out of range, or friendly (possible in case duel end) if (!victim || !victim->isTargetableForAttack() || !me->IsWithinDistInMap(victim, max_range) || - me->IsFriendlyTo(victim) || !me->canSeeOrDetect(victim)) + me->IsFriendlyTo(victim) || !me->CanSeeOrDetect(victim)) { victim = NULL; Trinity::NearestAttackableUnitInObjectRangeCheck u_check(me, me, max_range); diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 70c4761e025..9abdf9e8cfc 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -43,7 +43,7 @@ void UnitAI::DoMeleeAttackIfReady() if (me->HasUnitState(UNIT_STATE_CASTING)) return; - Unit* victim = me->getVictim(); + Unit* victim = me->GetVictim(); //Make sure our attack is ready and we aren't currently casting before checking distance if (me->isAttackReady() && me->IsWithinMeleeRange(victim)) { @@ -65,9 +65,9 @@ bool UnitAI::DoSpellAttackIfReady(uint32 spell) if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell)) { - if (me->IsWithinCombatRange(me->getVictim(), spellInfo->GetMaxRange(false))) + if (me->IsWithinCombatRange(me->GetVictim(), spellInfo->GetMaxRange(false))) { - me->CastSpell(me->getVictim(), spell, false); + me->CastSpell(me->GetVictim(), spell, false); me->resetAttackTimer(); return true; } @@ -94,7 +94,7 @@ float UnitAI::DoGetSpellMaxRange(uint32 spellId, bool positive) void UnitAI::DoAddAuraToAllHostilePlayers(uint32 spellid) { - if (me->isInCombat()) + if (me->IsInCombat()) { ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) @@ -108,7 +108,7 @@ void UnitAI::DoAddAuraToAllHostilePlayers(uint32 spellid) void UnitAI::DoCastToAllHostilePlayers(uint32 spellid, bool triggered) { - if (me->isInCombat()) + if (me->IsInCombat()) { ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) @@ -131,7 +131,7 @@ void UnitAI::DoCast(uint32 spellId) target = me; break; case AITARGET_VICTIM: - target = me->getVictim(); + target = me->GetVictim(); break; case AITARGET_ENEMY: { @@ -157,8 +157,8 @@ void UnitAI::DoCast(uint32 spellId) DefaultTargetSelector targetSelector(me, range, playerOnly, -(int32)spellId); if (!(spellInfo->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_VICTIM) - && targetSelector(me->getVictim())) - target = me->getVictim(); + && targetSelector(me->GetVictim())) + target = me->GetVictim(); else target = SelectTarget(SELECT_TARGET_RANDOM, 0, targetSelector); } @@ -180,10 +180,10 @@ void UnitAI::DoCast(Unit* victim, uint32 spellId, bool triggered) void UnitAI::DoCastVictim(uint32 spellId, bool triggered) { - if (!me->getVictim() || (me->HasUnitState(UNIT_STATE_CASTING) && !triggered)) + if (!me->GetVictim() || (me->HasUnitState(UNIT_STATE_CASTING) && !triggered)) return; - me->CastSpell(me->getVictim(), spellId, triggered); + me->CastSpell(me->GetVictim(), spellId, triggered); } void UnitAI::DoCastAOE(uint32 spellId, bool triggered) @@ -269,10 +269,10 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/) } } - if (!charmer->isInCombat()) + if (!charmer->IsInCombat()) me->GetMotionMaster()->MoveFollow(charmer, PET_FOLLOW_DIST, me->GetFollowAngle()); - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); if (!target || !charmer->IsValidAttackTarget(target)) AttackStart(charmer->SelectNearestTargetInAttackDistance()); } @@ -328,5 +328,5 @@ bool NonTankTargetSelector::operator()(Unit const* target) const if (_playerOnly && target->GetTypeId() != TYPEID_PLAYER) return false; - return target != _source->getVictim(); + return target != _source->GetVictim(); } diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 808a1a55a6a..09a6725485a 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -58,11 +58,11 @@ void CreatureAI::DoZoneInCombat(Creature* creature /*= NULL*/, float maxRangeToN return; } - if (!creature->HasReactState(REACT_PASSIVE) && !creature->getVictim()) + if (!creature->HasReactState(REACT_PASSIVE) && !creature->GetVictim()) { if (Unit* nearTarget = creature->SelectNearestTarget(maxRangeToNearestTarget)) creature->AI()->AttackStart(nearTarget); - else if (creature->isSummon()) + else if (creature->IsSummon()) { if (Unit* summoner = creature->ToTempSummon()->GetSummoner()) { @@ -75,7 +75,7 @@ void CreatureAI::DoZoneInCombat(Creature* creature /*= NULL*/, float maxRangeToN } } - if (!creature->HasReactState(REACT_PASSIVE) && !creature->getVictim()) + if (!creature->HasReactState(REACT_PASSIVE) && !creature->GetVictim()) { TC_LOG_ERROR(LOG_FILTER_GENERAL, "DoZoneInCombat called for creature that has empty threat list (creature entry = %u)", creature->GetEntry()); return; @@ -88,12 +88,12 @@ void CreatureAI::DoZoneInCombat(Creature* creature /*= NULL*/, float maxRangeToN for (Map::PlayerList::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { creature->SetInCombatWith(player); player->SetInCombatWith(creature); @@ -124,18 +124,18 @@ void CreatureAI::MoveInLineOfSight_Safe(Unit* who) void CreatureAI::MoveInLineOfSight(Unit* who) { - if (me->getVictim()) + if (me->GetVictim()) return; if (me->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) // non-combat pets should just stand there and look good;) return; - if (me->canStartAttack(who, false)) + if (me->CanStartAttack(who, false)) AttackStart(who); - //else if (who->getVictim() && me->IsFriendlyTo(who) + //else if (who->GetVictim() && me->IsFriendlyTo(who) // && me->IsWithinDistInMap(who, sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS)) - // && me->canStartAttack(who->getVictim(), true)) /// @todo if we use true, it will not attack it when it arrives - // me->GetMotionMaster()->MoveChase(who->getVictim()); + // && me->CanStartAttack(who->GetVictim(), true)) /// @todo if we use true, it will not attack it when it arrives + // me->GetMotionMaster()->MoveChase(who->GetVictim()); } void CreatureAI::EnterEvadeMode() @@ -171,7 +171,7 @@ void CreatureAI::EnterEvadeMode() /*void CreatureAI::AttackedBy(Unit* attacker) { - if (!me->getVictim()) + if (!me->GetVictim()) AttackStart(attacker); }*/ @@ -186,12 +186,12 @@ void CreatureAI::SetGazeOn(Unit* target) bool CreatureAI::UpdateVictimWithGaze() { - if (!me->isInCombat()) + if (!me->IsInCombat()) return false; if (me->HasReactState(REACT_PASSIVE)) { - if (me->getVictim()) + if (me->GetVictim()) return true; else me->SetReactState(REACT_AGGRESSIVE); @@ -199,19 +199,19 @@ bool CreatureAI::UpdateVictimWithGaze() if (Unit* victim = me->SelectVictim()) AttackStart(victim); - return me->getVictim(); + return me->GetVictim(); } bool CreatureAI::UpdateVictim() { - if (!me->isInCombat()) + if (!me->IsInCombat()) return false; if (!me->HasReactState(REACT_PASSIVE)) { if (Unit* victim = me->SelectVictim()) AttackStart(victim); - return me->getVictim(); + return me->GetVictim(); } else if (me->getThreatManager().isThreatListEmpty()) { @@ -224,7 +224,7 @@ bool CreatureAI::UpdateVictim() bool CreatureAI::_EnterEvadeMode() { - if (!me->isAlive()) + if (!me->IsAlive()) return false; // dont remove vehicle auras, passengers arent supposed to drop off the vehicle diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 3d71abb47a9..34339859a95 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -160,7 +160,7 @@ class CreatureAI : public UnitAI virtual void CorpseRemoved(uint32& /*respawnDelay*/) {} // Called when victim entered water and creature can not enter water - //virtual bool canReachByRangeAttack(Unit*) { return false; } + //virtual bool CanReachByRangeAttack(Unit*) { return false; } /// == Fields ======================================= diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index e7d61e73d06..d9cc356aaad 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -33,7 +33,7 @@ namespace FactorySelector const CreatureAICreator* ai_factory = NULL; CreatureAIRegistry& ai_registry(*CreatureAIRepository::instance()); - if (creature->isPet()) + if (creature->IsPet()) ai_factory = ai_registry.GetRegistryItem("PetAI"); //scriptname in db @@ -55,13 +55,13 @@ namespace FactorySelector ai_factory = ai_registry.GetRegistryItem("PetAI"); else if (creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK)) ai_factory = ai_registry.GetRegistryItem("NullCreatureAI"); - else if (creature->isGuard()) + else if (creature->IsGuard()) ai_factory = ai_registry.GetRegistryItem("GuardAI"); else if (creature->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) ai_factory = ai_registry.GetRegistryItem("PetAI"); - else if (creature->isTotem()) + else if (creature->IsTotem()) ai_factory = ai_registry.GetRegistryItem("TotemAI"); - else if (creature->isTrigger()) + else if (creature->IsTrigger()) { if (creature->m_spells[0]) ai_factory = ai_registry.GetRegistryItem("TriggerAI"); diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 687f43f616d..0a03c8ee336 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -139,7 +139,7 @@ void ScriptedAI::DoStartNoMovement(Unit* victim) void ScriptedAI::DoStopAttack() { - if (me->getVictim()) + if (me->GetVictim()) me->AttackStop(); } @@ -312,8 +312,8 @@ void ScriptedAI::DoTeleportAll(float x, float y, float z, float o) Map::PlayerList const& PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - if (Player* player = itr->getSource()) - if (player->isAlive()) + if (Player* player = itr->GetSource()) + if (player->IsAlive()) player->TeleportTo(me->GetMapId(), x, y, z, o, TELE_TO_NOT_LEAVE_COMBAT); } @@ -407,7 +407,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff) return false; } - if (me->IsInEvadeMode() || !me->getVictim()) + if (me->IsInEvadeMode() || !me->GetVictim()) return false; float x = me->GetPositionX(); @@ -454,7 +454,7 @@ BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature), void BossAI::_Reset() { - if (!me->isAlive()) + if (!me->IsAlive()) return; me->ResetLootMode(); @@ -555,7 +555,7 @@ bool BossAI::CheckBoundary(Unit* who) void BossAI::JustSummoned(Creature* summon) { summons.Summon(summon); - if (me->isInCombat()) + if (me->IsInCombat()) DoZoneInCombat(summon); } @@ -604,7 +604,7 @@ WorldBossAI::WorldBossAI(Creature* creature) : void WorldBossAI::_Reset() { - if (!me->isAlive()) + if (!me->IsAlive()) return; events.Reset(); diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 59de2baaed2..4fb7232711c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -55,7 +55,7 @@ void npc_escortAI::AttackStart(Unit* who) //see followerAI bool npc_escortAI::AssistPlayerInCombat(Unit* who) { - if (!who || !who->getVictim()) + if (!who || !who->GetVictim()) return false; //experimental (unknown) flag not present @@ -63,7 +63,7 @@ bool npc_escortAI::AssistPlayerInCombat(Unit* who) return false; //not a player - if (!who->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()) + if (!who->GetVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()) return false; //never attack friendly @@ -74,7 +74,7 @@ bool npc_escortAI::AssistPlayerInCombat(Unit* who) if (me->IsWithinDistInMap(who, GetMaxPlayerDistance()) && me->IsWithinLOSInMap(who)) { //already fighting someone? - if (!me->getVictim()) + if (!me->GetVictim()) { AttackStart(who); return true; @@ -105,7 +105,7 @@ void npc_escortAI::MoveInLineOfSight(Unit* who) float fAttackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, fAttackRadius) && me->IsWithinLOSInMap(who)) { - if (!me->getVictim()) + if (!me->GetVictim()) { who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH); AttackStart(who); @@ -130,7 +130,7 @@ void npc_escortAI::JustDied(Unit* /*killer*/) if (Group* group = player->GetGroup()) { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) - if (Player* member = groupRef->getSource()) + if (Player* member = groupRef->GetSource()) if (member->GetQuestStatus(m_pQuestForEscort->GetQuestId()) == QUEST_STATUS_INCOMPLETE) member->FailQuest(m_pQuestForEscort->GetQuestId()); } @@ -194,7 +194,7 @@ bool npc_escortAI::IsPlayerOrGroupInRange() if (Group* group = player->GetGroup()) { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) - if (Player* member = groupRef->getSource()) + if (Player* member = groupRef->GetSource()) if (me->IsWithinDistInMap(member, GetMaxPlayerDistance())) return true; } @@ -208,7 +208,7 @@ bool npc_escortAI::IsPlayerOrGroupInRange() void npc_escortAI::UpdateAI(uint32 diff) { //Waypoint Updating - if (HasEscortState(STATE_ESCORT_ESCORTING) && !me->getVictim() && m_uiWPWaitTimer && !HasEscortState(STATE_ESCORT_RETURNING)) + if (HasEscortState(STATE_ESCORT_ESCORTING) && !me->GetVictim() && m_uiWPWaitTimer && !HasEscortState(STATE_ESCORT_RETURNING)) { if (m_uiWPWaitTimer <= diff) { @@ -265,7 +265,7 @@ void npc_escortAI::UpdateAI(uint32 diff) } //Check if player or any member of his group is within range - if (HasEscortState(STATE_ESCORT_ESCORTING) && m_uiPlayerGUID && !me->getVictim() && !HasEscortState(STATE_ESCORT_RETURNING)) + if (HasEscortState(STATE_ESCORT_ESCORTING) && m_uiPlayerGUID && !me->GetVictim() && !HasEscortState(STATE_ESCORT_RETURNING)) { if (m_uiPlayerCheckTimer <= diff) { @@ -418,7 +418,7 @@ void npc_escortAI::SetRun(bool on) /// @todo get rid of this many variables passed in function. void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */, uint64 playerGUID /* = 0 */, Quest const* quest /* = NULL */, bool instantRespawn /* = false */, bool canLoopPath /* = false */, bool resetWaypoints /* = true */) { - if (me->getVictim()) + if (me->GetVictim()) { TC_LOG_ERROR(LOG_FILTER_GENERAL, "TSCR ERROR: EscortAI (script: %s, creature entry: %u) attempts to Start while in combat", me->GetScriptName().c_str(), me->GetEntry()); return; diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 6160fe68ce0..1c76399aa5c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -52,7 +52,7 @@ void FollowerAI::AttackStart(Unit* who) //The flag (type_flag) is unconfirmed, but used here for further research and is a good candidate. bool FollowerAI::AssistPlayerInCombat(Unit* who) { - if (!who || !who->getVictim()) + if (!who || !who->GetVictim()) return false; //experimental (unknown) flag not present @@ -60,7 +60,7 @@ bool FollowerAI::AssistPlayerInCombat(Unit* who) return false; //not a player - if (!who->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()) + if (!who->GetVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()) return false; //never attack friendly @@ -71,7 +71,7 @@ bool FollowerAI::AssistPlayerInCombat(Unit* who) if (me->IsWithinDistInMap(who, MAX_PLAYER_DISTANCE) && me->IsWithinLOSInMap(who)) { //already fighting someone? - if (!me->getVictim()) + if (!me->GetVictim()) { AttackStart(who); return true; @@ -102,7 +102,7 @@ void FollowerAI::MoveInLineOfSight(Unit* who) float fAttackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, fAttackRadius) && me->IsWithinLOSInMap(who)) { - if (!me->getVictim()) + if (!me->GetVictim()) { who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH); AttackStart(who); @@ -129,7 +129,7 @@ void FollowerAI::JustDied(Unit* /*killer*/) { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) { - if (Player* member = groupRef->getSource()) + if (Player* member = groupRef->GetSource()) { if (member->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE) member->FailQuest(m_pQuestForFollow->GetQuestId()); @@ -186,7 +186,7 @@ void FollowerAI::EnterEvadeMode() void FollowerAI::UpdateAI(uint32 uiDiff) { - if (HasFollowState(STATE_FOLLOW_INPROGRESS) && !me->getVictim()) + if (HasFollowState(STATE_FOLLOW_INPROGRESS) && !me->GetVictim()) { if (m_uiUpdateFollowTimer <= uiDiff) { @@ -214,7 +214,7 @@ void FollowerAI::UpdateAI(uint32 uiDiff) { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) { - Player* member = groupRef->getSource(); + Player* member = groupRef->GetSource(); if (member && me->IsWithinDistInMap(member, MAX_PLAYER_DISTANCE)) { @@ -273,7 +273,7 @@ void FollowerAI::MovementInform(uint32 motionType, uint32 pointId) void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, const Quest* quest) { - if (me->getVictim()) + if (me->GetVictim()) { TC_LOG_DEBUG(LOG_FILTER_TSCR, "FollowerAI attempt to StartFollow while in combat."); return; @@ -313,7 +313,7 @@ Player* FollowerAI::GetLeaderForFollower() { if (Player* player = Unit::GetPlayer(*me, m_uiLeaderGUID)) { - if (player->isAlive()) + if (player->IsAlive()) return player; else { @@ -321,9 +321,9 @@ Player* FollowerAI::GetLeaderForFollower() { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) { - Player* member = groupRef->getSource(); + Player* member = groupRef->GetSource(); - if (member && member->isAlive() && me->IsWithinDistInMap(member, MAX_PLAYER_DISTANCE)) + if (member && member->IsAlive() && me->IsWithinDistInMap(member, MAX_PLAYER_DISTANCE)) { TC_LOG_DEBUG(LOG_FILTER_TSCR, "FollowerAI GetLeader changed and returned new leader."); m_uiLeaderGUID = member->GetGUID(); diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index f8c99816cdf..4d2b5f88376 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -116,7 +116,7 @@ WayPoint* SmartAI::GetNextWayPoint() void SmartAI::StartPath(bool run, uint32 path, bool repeat, Unit* /*invoker*/) { - if (me->isInCombat())// no wp movement in combat + if (me->IsInCombat())// no wp movement in combat { TC_LOG_ERROR(LOG_FILTER_GENERAL, "SmartAI::StartPath: Creature entry %u wanted to start waypoint movement while in combat, ignoring.", me->GetEntry()); return; @@ -226,7 +226,7 @@ void SmartAI::EndPath(bool fail) { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) { - Player* groupGuy = groupRef->getSource(); + Player* groupGuy = groupRef->GetSource(); if (!fail && groupGuy->IsAtGroupRewardDistance(me) && !groupGuy->GetCorpse()) groupGuy->AreaExploredOrEventHappens(mEscortQuestID); @@ -284,7 +284,7 @@ void SmartAI::UpdatePath(const uint32 diff) { if (mWPPauseTimer < diff) { - if (!me->isInCombat() && !HasEscortState(SMART_ESCORT_RETURNING) && (mWPReached || mLastWPIDReached == SMART_ESCORT_LAST_OOC_POINT || mForcedPaused)) + if (!me->IsInCombat() && !HasEscortState(SMART_ESCORT_RETURNING) && (mWPReached || mLastWPIDReached == SMART_ESCORT_LAST_OOC_POINT || mForcedPaused)) { GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_RESUMED, NULL, mLastWP->id, GetScript()->GetPathId()); RemoveEscortState(SMART_ESCORT_PAUSED); @@ -312,7 +312,7 @@ void SmartAI::UpdatePath(const uint32 diff) mWPReached = false; } } - if (me->isInCombat() || HasEscortState(SMART_ESCORT_PAUSED | SMART_ESCORT_RETURNING)) + if (me->IsInCombat() || HasEscortState(SMART_ESCORT_PAUSED | SMART_ESCORT_RETURNING)) return; // handle next wp if (mWPReached)//reached WP @@ -390,7 +390,7 @@ bool SmartAI::IsEscortInvokerInRange() { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) { - Player* groupGuy = groupRef->getSource(); + Player* groupGuy = groupRef->GetSource(); if (me->GetDistance(groupGuy) <= SMART_ESCORT_MAX_PLAYER_DIST) return true; @@ -446,7 +446,7 @@ void SmartAI::RemoveAuras() void SmartAI::EnterEvadeMode() { - if (!me->isAlive() || me->IsInEvadeMode()) + if (!me->IsAlive() || me->IsInEvadeMode()) return; RemoveAuras(); @@ -490,7 +490,7 @@ void SmartAI::MoveInLineOfSight(Unit* who) if (!CanAIAttack(who)) return; - if (!me->canStartAttack(who, false)) + if (!me->CanStartAttack(who, false)) return; if (me->IsHostileTo(who)) @@ -498,7 +498,7 @@ void SmartAI::MoveInLineOfSight(Unit* who) float fAttackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, fAttackRadius) && me->IsWithinLOSInMap(who)) { - if (!me->getVictim()) + if (!me->GetVictim()) { who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH); AttackStart(who); @@ -521,7 +521,7 @@ bool SmartAI::CanAIAttack(const Unit* /*who*/) const bool SmartAI::AssistPlayerInCombat(Unit* who) { - if (!who || !who->getVictim()) + if (!who || !who->GetVictim()) return false; //experimental (unknown) flag not present @@ -529,7 +529,7 @@ bool SmartAI::AssistPlayerInCombat(Unit* who) return false; //not a player - if (!who->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()) + if (!who->GetVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()) return false; //never attack friendly @@ -540,7 +540,7 @@ bool SmartAI::AssistPlayerInCombat(Unit* who) if (me->IsWithinDistInMap(who, SMART_MAX_AID_DIST) && me->IsWithinLOSInMap(who)) { //already fighting someone? - if (!me->getVictim()) + if (!me->GetVictim()) { AttackStart(who); return true; @@ -784,12 +784,12 @@ void SmartAI::SetCombatMove(bool on) mCanCombatMove = on; if (!HasEscortState(SMART_ESCORT_ESCORTING)) { - if (on && me->getVictim()) + if (on && me->GetVictim()) { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == IDLE_MOTION_TYPE) { SetRun(mRun); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); me->CastStop(); } } @@ -939,7 +939,7 @@ class SmartTrigger : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { - if (!player->isAlive()) + if (!player->IsAlive()) return false; TC_LOG_DEBUG(LOG_FILTER_DATABASE_AI, "AreaTrigger %u is using SmartTrigger script", trigger->id); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 9d182ee6885..2abc526134c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -166,7 +166,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { - if (IsCreature((*itr))) + if (IsCreature((*itr)) && !(*itr)->ToCreature()->IsPet()) // Prevented sending text to pets. { talker = (*itr)->ToCreature(); break; @@ -1042,7 +1042,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; // The AI is only updated if the creature is alive - if (me->isAlive()) + if (me->IsAlive()) { CAST_AI(SmartAI, me->AI())->SetDespawnTime(e.action.forceDespawn.delay + 1); // Next tick CAST_AI(SmartAI, me->AI())->StartDespawn(); @@ -1602,9 +1602,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr) if (Creature* target = (*itr)->ToCreature()) - if (IsSmart(target) && target->getVictim()) + if (IsSmart(target) && target->GetVictim()) if (CAST_AI(SmartAI, target->AI())->CanCombatMove()) - target->GetMotionMaster()->MoveChase(target->getVictim(), attackDistance, attackAngle); + target->GetMotionMaster()->MoveChase(target->GetVictim(), attackDistance, attackAngle); delete targets; } @@ -2257,8 +2257,8 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* l->push_back(baseObject); break; case SMART_TARGET_VICTIM: - if (me && me->getVictim()) - l->push_back(me->getVictim()); + if (me && me->GetVictim()) + l->push_back(me->GetVictim()); break; case SMART_TARGET_HOSTILE_SECOND_AGGRO: if (me) @@ -2297,7 +2297,7 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* if (Group* group = player->GetGroup()) { for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next()) - if (Player* member = groupRef->getSource()) + if (Player* member = groupRef->GetSource()) l->push_back(member); } // We still add the player to the list if there is no group. If we do @@ -2532,18 +2532,18 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax); break; case SMART_EVENT_UPDATE_OOC: - if (me && me->isInCombat()) + if (me && me->IsInCombat()) return; ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax); break; case SMART_EVENT_UPDATE_IC: - if (!me || !me->isInCombat()) + if (!me || !me->IsInCombat()) return; ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax); break; case SMART_EVENT_HEALT_PCT: { - if (!me || !me->isInCombat() || !me->GetMaxHealth()) + if (!me || !me->IsInCombat() || !me->GetMaxHealth()) return; uint32 perc = (uint32)me->GetHealthPct(); if (perc > e.event.minMaxRepeat.max || perc < e.event.minMaxRepeat.min) @@ -2553,17 +2553,17 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_TARGET_HEALTH_PCT: { - if (!me || !me->isInCombat() || !me->getVictim() || !me->getVictim()->GetMaxHealth()) + if (!me || !me->IsInCombat() || !me->GetVictim() || !me->GetVictim()->GetMaxHealth()) return; - uint32 perc = (uint32)me->getVictim()->GetHealthPct(); + uint32 perc = (uint32)me->GetVictim()->GetHealthPct(); if (perc > e.event.minMaxRepeat.max || perc < e.event.minMaxRepeat.min) return; - ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->getVictim()); + ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->GetVictim()); break; } case SMART_EVENT_MANA_PCT: { - if (!me || !me->isInCombat() || !me->GetMaxPower(POWER_MANA)) + if (!me || !me->IsInCombat() || !me->GetMaxPower(POWER_MANA)) return; uint32 perc = uint32(100.0f * me->GetPower(POWER_MANA) / me->GetMaxPower(POWER_MANA)); if (perc > e.event.minMaxRepeat.max || perc < e.event.minMaxRepeat.min) @@ -2573,34 +2573,34 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_TARGET_MANA_PCT: { - if (!me || !me->isInCombat() || !me->getVictim() || !me->getVictim()->GetMaxPower(POWER_MANA)) + if (!me || !me->IsInCombat() || !me->GetVictim() || !me->GetVictim()->GetMaxPower(POWER_MANA)) return; - uint32 perc = uint32(100.0f * me->getVictim()->GetPower(POWER_MANA) / me->getVictim()->GetMaxPower(POWER_MANA)); + uint32 perc = uint32(100.0f * me->GetVictim()->GetPower(POWER_MANA) / me->GetVictim()->GetMaxPower(POWER_MANA)); if (perc > e.event.minMaxRepeat.max || perc < e.event.minMaxRepeat.min) return; - ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->getVictim()); + ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->GetVictim()); break; } case SMART_EVENT_RANGE: { - if (!me || !me->isInCombat() || !me->getVictim()) + if (!me || !me->IsInCombat() || !me->GetVictim()) return; - if (me->IsInRange(me->getVictim(), (float)e.event.minMaxRepeat.min, (float)e.event.minMaxRepeat.max)) - ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->getVictim()); + if (me->IsInRange(me->GetVictim(), (float)e.event.minMaxRepeat.min, (float)e.event.minMaxRepeat.max)) + ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->GetVictim()); break; } case SMART_EVENT_TARGET_CASTING: { - if (!me || !me->isInCombat() || !me->getVictim() || !me->getVictim()->IsNonMeleeSpellCasted(false, false, true)) + if (!me || !me->IsInCombat() || !me->GetVictim() || !me->GetVictim()->IsNonMeleeSpellCasted(false, false, true)) return; - ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->getVictim()); + ProcessTimedAction(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax, me->GetVictim()); break; } case SMART_EVENT_FRIENDLY_HEALTH: { - if (!me || !me->isInCombat()) + if (!me || !me->IsInCombat()) return; Unit* target = DoSelectLowestHpFriendly((float)e.event.friendlyHealt.radius, e.event.friendlyHealt.hpDeficit); @@ -2611,7 +2611,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_FRIENDLY_IS_CC: { - if (!me || !me->isInCombat()) + if (!me || !me->IsInCombat()) return; std::list<Creature*> pList; @@ -2643,9 +2643,9 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_TARGET_BUFFED: { - if (!me || !me->getVictim()) + if (!me || !me->GetVictim()) return; - uint32 count = me->getVictim()->GetAuraCount(e.event.aura.spell); + uint32 count = me->GetVictim()->GetAuraCount(e.event.aura.spell); if (count < e.event.aura.count) return; ProcessTimedAction(e, e.event.aura.repeatMin, e.event.aura.repeatMax); @@ -2680,7 +2680,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui if (!me) return; - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { if (!victim->HasInArc(static_cast<float>(M_PI), me)) ProcessTimedAction(e, e.event.behindTarget.cooldownMin, e.event.behindTarget.cooldownMax, victim); @@ -2721,7 +2721,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_OOC_LOS: { - if (!me || me->isInCombat()) + if (!me || me->IsInCombat()) return; //can trigger if closer than fMaxAllowedRange float range = (float)e.event.los.maxDist; @@ -2741,7 +2741,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_IC_LOS: { - if (!me || !me->isInCombat()) + if (!me || !me->IsInCombat()) return; //can trigger if closer than fMaxAllowedRange float range = (float)e.event.los.maxDist; @@ -2961,10 +2961,10 @@ void SmartScript::UpdateTimer(SmartScriptHolder& e, uint32 const diff) if (e.event.event_phase_mask && !IsInPhase(e.event.event_phase_mask)) return; - if (e.GetEventType() == SMART_EVENT_UPDATE_IC && (!me || !me->isInCombat())) + if (e.GetEventType() == SMART_EVENT_UPDATE_IC && (!me || !me->IsInCombat())) return; - if (e.GetEventType() == SMART_EVENT_UPDATE_OOC && (me && me->isInCombat()))//can be used with me=NULL (go script) + if (e.GetEventType() == SMART_EVENT_UPDATE_OOC && (me && me->IsInCombat()))//can be used with me=NULL (go script) return; if (e.timer < diff) @@ -3199,7 +3199,7 @@ void SmartScript::OnMoveInLineOfSight(Unit* who) if (!me) return; - if (me->getVictim()) + if (me->GetVictim()) return; ProcessEventsFor(SMART_EVENT_IC_LOS, who); diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 845e96794bd..a4e50dc1281 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -465,7 +465,7 @@ void AchievementMgr<T>::ResetAchievementCriteria(AchievementCriteriaTypes type, TC_LOG_DEBUG(LOG_FILTER_ACHIEVEMENTSYS, "ResetAchievementCriteria(%u, " UI64FMTD ", " UI64FMTD ")", type, miscValue1, miscValue2); // disable for gamemasters with GM-mode enabled - if (GetOwner()->isGameMaster()) + if (GetOwner()->IsGameMaster()) return; AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr->GetAchievementCriteriaByType(type); @@ -1099,7 +1099,7 @@ void AchievementMgr<T>::UpdateAchievementCriteria(AchievementCriteriaTypes type, } // disable for gamemasters with GM-mode enabled - if (referencePlayer->isGameMaster()) + if (referencePlayer->IsGameMaster()) { TC_LOG_DEBUG(LOG_FILTER_ACHIEVEMENTSYS, "UpdateAchievementCriteria: [Player %s GM mode on] %s, %s (%u), " UI64FMTD ", " UI64FMTD ", " UI64FMTD , referencePlayer->GetName().c_str(), GetLogNameForGuid(GetOwner()->GetGUID()), AchievementGlobalMgr::GetCriteriaTypeString(type), type, miscValue1, miscValue2, miscValue3); @@ -1855,7 +1855,7 @@ template<> void AchievementMgr<Player>::CompletedAchievement(AchievementEntry const* achievement, Player* referencePlayer) { // disable for gamemasters with GM-mode enabled - if (GetOwner()->isGameMaster()) + if (GetOwner()->IsGameMaster()) return; if (achievement->flags & ACHIEVEMENT_FLAG_COUNTER || HasAchieved(achievement->ID)) @@ -1961,7 +1961,7 @@ void AchievementMgr<Guild>::CompletedAchievement(AchievementEntry const* achieve if (Group const* group = referencePlayer->GetGroup()) for (GroupReference const* ref = group->GetFirstMember(); ref != NULL; ref = ref->next()) - if (Player const* groupMember = ref->getSource()) + if (Player const* groupMember = ref->GetSource()) if (groupMember->GetGuildId() == GetOwner()->GetId()) ca.guids.insert(groupMember->GetGUID()); } @@ -2723,7 +2723,7 @@ bool AchievementMgr<T>::AdditionalRequirementsSatisfied(AchievementCriteriaEntry return false; break; case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_MUST_BE_DEAD: // 6 - if (!unit || unit->isAlive()) + if (!unit || unit->IsAlive()) return false; break; case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_MUST_BE_ENEMY: // 7 diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index cd1bade2bd9..bff46b9de73 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -256,7 +256,7 @@ void Battlefield::InvitePlayerToWar(Player* player) return; /// @todo needed ? - if (player->isInFlight()) + if (player->IsInFlight()) return; if (player->InArena() || player->GetBattleground()) @@ -521,7 +521,7 @@ void Battlefield::ShowNpc(Creature* creature, bool aggressive) creature->SetPhaseMask(1, true); creature->SetVisible(true); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - if (!creature->isAlive()) + if (!creature->IsAlive()) creature->Respawn(true); if (aggressive) creature->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 3e98c68efcd..be2aa7711a9 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -559,7 +559,7 @@ inline void Battleground::_ProcessJoin(uint32 diff) player->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION); player->ResetAllPowers(); - if (!player->isGameMaster()) + if (!player->IsGameMaster()) { // remove auras with duration lower than 30s Unit::AuraApplicationMap & auraMap = player->GetAppliedAuras(); @@ -886,10 +886,10 @@ void Battleground::EndBattleground(uint32 winner) player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); // Last standing - Rated 5v5 arena & be solely alive player - if (team == winner && isArena() && isRated() && GetArenaType() == ARENA_TYPE_5v5 && aliveWinners == 1 && player->isAlive()) + if (team == winner && isArena() && isRated() && GetArenaType() == ARENA_TYPE_5v5 && aliveWinners == 1 && player->IsAlive()) player->CastSpell(player, SPELL_THE_LAST_STANDING, true); - if (!player->isAlive()) + if (!player->IsAlive()) { player->ResurrectPlayer(1.0f); player->SpawnCorpseBones(); @@ -1037,7 +1037,7 @@ void Battleground::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)) player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); - if (!player->isAlive()) // resurrect on exit + if (!player->IsAlive()) // resurrect on exit { player->ResurrectPlayer(1.0f); player->SpawnCorpseBones(); @@ -1927,7 +1927,7 @@ uint32 Battleground::GetAlivePlayersCountByTeam(uint32 Team) const if (itr->second.Team == Team) { Player* player = ObjectAccessor::FindPlayer(itr->first); - if (player && player->isAlive() && !player->HasByteFlag(UNIT_FIELD_BYTES_2, 3, FORM_SPIRITOFREDEMPTION)) + if (player && player->IsAlive() && !player->HasByteFlag(UNIT_FIELD_BYTES_2, 3, FORM_SPIRITOFREDEMPTION)) ++count; } } diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 5d6bab27070..4ac09bd2b30 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -171,7 +171,7 @@ GroupQueueInfo* BattlegroundQueue::AddGroup(Player* leader, Group* grp, Battlegr { for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); if (!member) continue; // this should never happen PlayerQueueInfo& pl_info = m_QueuedPlayers[member->GetGUID()]; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 0ececf6c6f7..c87fd3db8ca 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -381,7 +381,7 @@ void BattlegroundEY::HandleAreaTrigger(Player* player, uint32 trigger) if (GetStatus() != STATUS_IN_PROGRESS) return; - if (!player->isAlive()) //hack code, must be removed later + if (!player->IsAlive()) //hack code, must be removed later return; switch (trigger) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index a73eee25ac1..7b4f323ac31 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -151,7 +151,7 @@ void BattlegroundIC::PostUpdateImpl(uint32 diff) { if (Creature* catapult = GetBGCreature(u)) { - if (!catapult->isAlive()) + if (!catapult->IsAlive()) catapult->Respawn(true); } } @@ -161,7 +161,7 @@ void BattlegroundIC::PostUpdateImpl(uint32 diff) { if (Creature* glaiveThrower = GetBGCreature(u)) { - if (!glaiveThrower->isAlive()) + if (!glaiveThrower->IsAlive()) glaiveThrower->Respawn(true); } } @@ -182,7 +182,7 @@ void BattlegroundIC::PostUpdateImpl(uint32 diff) if (Creature* siege = GetBGCreature(siegeType)) // this always should be true { - if (siege->isAlive()) + if (siege->IsAlive()) { if (siege->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_UNK_14|UNIT_FLAG_IMMUNE_TO_PC)) // following sniffs the vehicle always has UNIT_FLAG_UNK_14 @@ -199,7 +199,7 @@ void BattlegroundIC::PostUpdateImpl(uint32 diff) { if (Creature* demolisher = GetBGCreature(u)) { - if (!demolisher->isAlive()) + if (!demolisher->IsAlive()) demolisher->Respawn(true); } } @@ -718,7 +718,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) { uint8 type = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_GLAIVE_THROWER_1_A : BG_IC_NPC_GLAIVE_THROWER_1_H)+i; - if (GetBGCreature(type) && GetBGCreature(type)->isAlive()) + if (GetBGCreature(type) && GetBGCreature(type)->IsAlive()) continue; if (AddCreature(nodePoint->faction == TEAM_ALLIANCE ? NPC_GLAIVE_THROWER_A : NPC_GLAIVE_THROWER_H, type, nodePoint->faction, @@ -733,7 +733,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) { uint8 type = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_CATAPULT_1_A : BG_IC_NPC_CATAPULT_1_H)+i; - if (GetBGCreature(type) && GetBGCreature(type)->isAlive()) + if (GetBGCreature(type) && GetBGCreature(type)->IsAlive()) continue; if (AddCreature(NPC_CATAPULT, type, nodePoint->faction, @@ -768,7 +768,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) { uint8 type = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_DEMOLISHER_1_A : BG_IC_NPC_DEMOLISHER_1_H)+i; - if (GetBGCreature(type) && GetBGCreature(type)->isAlive()) + if (GetBGCreature(type) && GetBGCreature(type)->IsAlive()) continue; if (AddCreature(NPC_DEMOLISHER, type, nodePoint->faction, @@ -792,7 +792,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) } uint8 siegeType = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_SIEGE_ENGINE_A : BG_IC_NPC_SIEGE_ENGINE_H); - if (!GetBGCreature(siegeType) || !GetBGCreature(siegeType)->isAlive()) + if (!GetBGCreature(siegeType) || !GetBGCreature(siegeType)->IsAlive()) { AddCreature((nodePoint->faction == TEAM_ALLIANCE ? NPC_SIEGE_ENGINE_A : NPC_SIEGE_ENGINE_H), siegeType, nodePoint->faction, BG_IC_WorkshopVehicles[4].GetPositionX(), BG_IC_WorkshopVehicles[4].GetPositionY(), diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 0fd963cc0cf..24c989d76dd 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -507,7 +507,7 @@ void BattlegroundSA::TeleportPlayers() if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)) player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); - if (!player->isAlive()) + if (!player->IsAlive()) { player->ResurrectPlayer(1.0f); player->SpawnCorpseBones(); diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp index 5b228229e89..4cd76b4e7a2 100644 --- a/src/server/game/Combat/HostileRefManager.cpp +++ b/src/server/game/Combat/HostileRefManager.cpp @@ -40,8 +40,8 @@ void HostileRefManager::threatAssist(Unit* victim, float baseThreat, SpellInfo c threat /= getSize(); while (ref) { - if (ThreatCalcHelper::isValidProcess(victim, ref->getSource()->getOwner(), threatSpell)) - ref->getSource()->doAddThreat(victim, threat); + if (ThreatCalcHelper::isValidProcess(victim, ref->GetSource()->GetOwner(), threatSpell)) + ref->GetSource()->doAddThreat(victim, threat); ref = ref->next(); } @@ -130,7 +130,7 @@ void HostileRefManager::deleteReferencesForFaction(uint32 faction) while (ref) { HostileReference* nextRef = ref->next(); - if (ref->getSource()->getOwner()->getFactionTemplateEntry()->faction == faction) + if (ref->GetSource()->GetOwner()->GetFactionTemplateEntry()->faction == faction) { ref->removeReference(); delete ref; @@ -148,7 +148,7 @@ void HostileRefManager::deleteReference(Unit* creature) while (ref) { HostileReference* nextRef = ref->next(); - if (ref->getSource()->getOwner() == creature) + if (ref->GetSource()->GetOwner() == creature) { ref->removeReference(); delete ref; @@ -167,7 +167,7 @@ void HostileRefManager::setOnlineOfflineState(Unit* creature, bool isOnline) while (ref) { HostileReference* nextRef = ref->next(); - if (ref->getSource()->getOwner() == creature) + if (ref->GetSource()->GetOwner() == creature) { ref->setOnlineOfflineState(isOnline); break; @@ -184,7 +184,7 @@ void HostileRefManager::UpdateVisibility() while (ref) { HostileReference* nextRef = ref->next(); - if (!ref->getSource()->getOwner()->canSeeOrDetect(getOwner())) + if (!ref->GetSource()->GetOwner()->CanSeeOrDetect(GetOwner())) { nextRef = ref->next(); ref->removeReference(); diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h index e1d3fd5ed84..84c8db8bff0 100644 --- a/src/server/game/Combat/HostileRefManager.h +++ b/src/server/game/Combat/HostileRefManager.h @@ -37,7 +37,7 @@ class HostileRefManager : public RefManager<Unit, ThreatManager> explicit HostileRefManager(Unit* owner) { iOwner = owner; } ~HostileRefManager(); - Unit* getOwner() { return iOwner; } + Unit* GetOwner() { return iOwner; } // send threat to all my hateres for the victim // The victim is hated than by them as well diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 249c1696348..b24979d9131 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -67,11 +67,11 @@ bool ThreatCalcHelper::isValidProcess(Unit* hatedUnit, Unit* hatingUnit, SpellIn return false; // not to GM - if (hatedUnit->GetTypeId() == TYPEID_PLAYER && hatedUnit->ToPlayer()->isGameMaster()) + if (hatedUnit->GetTypeId() == TYPEID_PLAYER && hatedUnit->ToPlayer()->IsGameMaster()) return false; // not to dead and not for dead - if (!hatedUnit->isAlive() || !hatingUnit->isAlive()) + if (!hatedUnit->IsAlive() || !hatingUnit->IsAlive()) return false; // not in same map or phase @@ -128,8 +128,8 @@ void HostileReference::sourceObjectDestroyLink() void HostileReference::fireStatusChanged(ThreatRefStatusChangeEvent& threatRefStatusChangeEvent) { - if (getSource()) - getSource()->processThreatEvent(&threatRefStatusChangeEvent); + if (GetSource()) + GetSource()->processThreatEvent(&threatRefStatusChangeEvent); } //============================================================ @@ -150,8 +150,8 @@ void HostileReference::addThreat(float modThreat) if (isValid() && modThreat >= 0.0f) { Unit* victimOwner = getTarget()->GetCharmerOrOwner(); - if (victimOwner && victimOwner->isAlive()) - getSource()->addThreat(victimOwner, 0.0f); // create a threat to the owner of a pet, if the pet attacks + if (victimOwner && victimOwner->IsAlive()) + GetSource()->addThreat(victimOwner, 0.0f); // create a threat to the owner of a pet, if the pet attacks } } @@ -171,21 +171,21 @@ void HostileReference::updateOnlineStatus() bool accessible = false; if (!isValid()) - if (Unit* target = ObjectAccessor::GetUnit(*getSourceUnit(), getUnitGuid())) - link(target, getSource()); + if (Unit* target = ObjectAccessor::GetUnit(*GetSourceUnit(), getUnitGuid())) + link(target, GetSource()); // only check for online status if // ref is valid // target is no player or not gamemaster // target is not in flight if (isValid() - && (getTarget()->GetTypeId() != TYPEID_PLAYER || !getTarget()->ToPlayer()->isGameMaster()) + && (getTarget()->GetTypeId() != TYPEID_PLAYER || !getTarget()->ToPlayer()->IsGameMaster()) && !getTarget()->HasUnitState(UNIT_STATE_IN_FLIGHT) - && getTarget()->IsInMap(getSourceUnit()) - && getTarget()->InSamePhase(getSourceUnit()) + && getTarget()->IsInMap(GetSourceUnit()) + && getTarget()->InSamePhase(GetSourceUnit()) ) { - Creature* creature = getSourceUnit()->ToCreature(); + Creature* creature = GetSourceUnit()->ToCreature(); online = getTarget()->isInAccessiblePlaceFor(creature); if (!online) { @@ -242,9 +242,9 @@ void HostileReference::removeReference() //============================================================ -Unit* HostileReference::getSourceUnit() +Unit* HostileReference::GetSourceUnit() { - return (getSource()->getOwner()); + return (GetSource()->GetOwner()); } //============================================================ @@ -350,14 +350,14 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* attacker, HostileR } } - if (attacker->canCreatureAttack(target)) // skip non attackable currently targets + if (attacker->CanCreatureAttack(target)) // skip non attackable currently targets { if (currentVictim) // select 1.3/1.1 better target in comparison current target { // list sorted and and we check current target, then this is best case if (currentVictim == currentRef || currentRef->getThreat() <= 1.1f * currentVictim->getThreat()) { - if (currentVictim != currentRef && attacker->canCreatureAttack(currentVictim->getTarget())) + if (currentVictim != currentRef && attacker->CanCreatureAttack(currentVictim->getTarget())) currentRef = currentVictim; // for second case, if currentvictim is attackable found = true; @@ -408,7 +408,7 @@ void ThreatManager::clearReferences() void ThreatManager::addThreat(Unit* victim, float threat, SpellSchoolMask schoolMask, SpellInfo const* threatSpell) { - if (!ThreatCalcHelper::isValidProcess(victim, getOwner(), threatSpell)) + if (!ThreatCalcHelper::isValidProcess(victim, GetOwner(), threatSpell)) return; doAddThreat(victim, ThreatCalcHelper::calcThreat(victim, iOwner, threat, schoolMask, threatSpell)); @@ -445,7 +445,7 @@ void ThreatManager::_addThreat(Unit* victim, float threat) HostileReference* hostileRef = new HostileReference(victim, this, 0); iThreatContainer.addReference(hostileRef); hostileRef->addThreat(threat); // now we add the real threat - if (victim->GetTypeId() == TYPEID_PLAYER && victim->ToPlayer()->isGameMaster()) + if (victim->GetTypeId() == TYPEID_PLAYER && victim->ToPlayer()->IsGameMaster()) hostileRef->setOnlineOfflineState(false); // GM is always offline } } @@ -462,7 +462,7 @@ void ThreatManager::modifyThreatPercent(Unit* victim, int32 percent) Unit* ThreatManager::getHostilTarget() { iThreatContainer.update(); - HostileReference* nextVictim = iThreatContainer.selectNextVictim(getOwner()->ToCreature(), getCurrentVictim()); + HostileReference* nextVictim = iThreatContainer.selectNextVictim(GetOwner()->ToCreature(), getCurrentVictim()); setCurrentVictim(nextVictim); return getCurrentVictim() != NULL ? getCurrentVictim()->getTarget() : NULL; } diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index 8162ad50eb7..9b249bd4bee 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -128,7 +128,7 @@ class HostileReference : public Reference<Unit, ThreatManager> // Inform the source, that the status of that reference was changed void fireStatusChanged(ThreatRefStatusChangeEvent& threatRefStatusChangeEvent); - Unit* getSourceUnit(); + Unit* GetSourceUnit(); private: float iThreat; float iTempThreatModifier; // used for taunt @@ -224,7 +224,7 @@ class ThreatManager HostileReference* getCurrentVictim() const { return iCurrentVictim; } - Unit* getOwner() const { return iOwner; } + Unit* GetOwner() const { return iOwner; } Unit* getHostilTarget(); diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index d6fb6905985..7f530f2d96a 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -275,7 +275,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) case CONDITION_ALIVE: { if (Unit* unit = object->ToUnit()) - condMeets = unit->isAlive(); + condMeets = unit->IsAlive(); break; } case CONDITION_HP_VAL: diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 45bbfe565fc..529ca8dc9ec 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -309,7 +309,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags if (unit) { if ((spellFlags & SPELL_DISABLE_PLAYER && unit->GetTypeId() == TYPEID_PLAYER) || - (unit->GetTypeId() == TYPEID_UNIT && ((unit->ToCreature()->isPet() && spellFlags & SPELL_DISABLE_PET) || spellFlags & SPELL_DISABLE_CREATURE))) + (unit->GetTypeId() == TYPEID_UNIT && ((unit->ToCreature()->IsPet() && spellFlags & SPELL_DISABLE_PET) || spellFlags & SPELL_DISABLE_CREATURE))) { if (spellFlags & SPELL_DISABLE_MAP) { @@ -372,7 +372,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags if (!unit) return true; if (Player const* player = unit->ToPlayer()) - if (player->isGameMaster()) + if (player->IsGameMaster()) return false; return true; case DISABLE_TYPE_BATTLEGROUND: diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index a2cf3d48a17..9eebc460d3b 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -492,7 +492,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const uint8 memberCount = 0; for (GroupReference* itr = grp->GetFirstMember(); itr != NULL && joinData.result == LFG_JOIN_OK; itr = itr->next()) { - if (Player* plrg = itr->getSource()) + if (Player* plrg = itr->GetSource()) { if (!plrg->GetSession()->HasPermission(RBAC_PERM_JOIN_DUNGEON_FINDER)) joinData.result = LFG_JOIN_PARTY_NOT_MEET_REQS; @@ -602,7 +602,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const LfgUpdateData updateData = LfgUpdateData(LFG_UPDATETYPE_JOIN_QUEUE, dungeons, comment); for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { - if (Player* plrg = itr->getSource()) + if (Player* plrg = itr->GetSource()) { uint64 pguid = plrg->GetGUID(); plrg->GetSession()->SendLfgUpdateParty(updateData); @@ -1327,7 +1327,7 @@ void LFGMgr::TeleportPlayer(Player* player, bool out, bool fromOpcode /*= false* LfgTeleportError error = LFG_TELEPORTERROR_OK; - if (!player->isAlive()) + if (!player->IsAlive()) error = LFG_TELEPORTERROR_PLAYER_DEAD; else if (player->IsFalling() || player->HasUnitState(UNIT_STATE_JUMPING)) error = LFG_TELEPORTERROR_FALLING; @@ -1350,7 +1350,7 @@ void LFGMgr::TeleportPlayer(Player* player, bool out, bool fromOpcode /*= false* // Select a player inside to be teleported to for (GroupReference* itr = group->GetFirstMember(); itr != NULL && !mapid; itr = itr->next()) { - Player* plrg = itr->getSource(); + Player* plrg = itr->GetSource(); if (plrg && plrg != player && plrg->GetMapId() == uint32(dungeon->map)) { mapid = plrg->GetMapId(); @@ -1366,7 +1366,7 @@ void LFGMgr::TeleportPlayer(Player* player, bool out, bool fromOpcode /*= false* if (!player->GetMap()->IsDungeon()) player->SetBattlegroundEntryPoint(); - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index 98b5265a8ba..9dfbb0e9fb3 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -110,7 +110,7 @@ void LFGPlayerScript::OnMapChanged(Player* player) } for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) player->GetSession()->SendNameQueryOpcode(member->GetGUID()); if (sLFGMgr->selectedRandomLfgDungeon(player->GetGUID())) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index f0b21a29bd2..ebbf11be586 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -210,14 +210,14 @@ void Creature::DisappearAndDie() DestroyForNearbyPlayers(); //SetVisibility(VISIBILITY_OFF); //ObjectAccessor::UpdateObjectVisibility(this); - if (isAlive()) + if (IsAlive()) setDeathState(JUST_DIED); RemoveCorpse(false); } void Creature::SearchFormation() { - if (isSummon()) + if (IsSummon()) return; uint32 lowguid = GetDBTableGUIDLow(); @@ -426,7 +426,7 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData* data) } // trigger creature is always not selectable and can not be attacked - if (isTrigger()) + if (IsTrigger()) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); InitializeReactState(); @@ -520,7 +520,7 @@ void Creature::Update(uint32 diff) // creature can be dead after Unit::Update call // CORPSE/DEAD state will processed at next tick (in other case death timer will be updated unexpectedly) - if (!isAlive()) + if (!IsAlive()) break; // if creature is charmed, switch to charmed AI @@ -541,7 +541,7 @@ void Creature::Update(uint32 diff) // creature can be dead after UpdateAI call // CORPSE/DEAD state will processed at next tick (in other case death timer will be updated unexpectedly) - if (!isAlive()) + if (!IsAlive()) break; if (m_regenTimer > 0) @@ -555,9 +555,9 @@ void Creature::Update(uint32 diff) if (m_regenTimer != 0) break; - bool bInCombat = isInCombat() && (!getVictim() || // if isInCombat() is true and this has no victim - !getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() || // or the victim/owner/charmer is not a player - !getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()); // or the victim/owner/charmer is not a GameMaster + bool bInCombat = IsInCombat() && (!GetVictim() || // if IsInCombat() is true and this has no victim + !GetVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() || // or the victim/owner/charmer is not a player + !GetVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->IsGameMaster()); // or the victim/owner/charmer is not a GameMaster /*if (m_regenTimer <= diff) {*/ @@ -599,7 +599,7 @@ void Creature::RegenerateMana() uint32 addvalue = 0; // Combat and any controlled creature - if (isInCombat() || GetCharmerOrOwnerGUID()) + if (IsInCombat() || GetCharmerOrOwnerGUID()) { float ManaIncreaseRate = sWorld->getRate(RATE_POWER_MANA); float Spirit = GetStat(STAT_SPIRIT); @@ -659,7 +659,7 @@ void Creature::RegenerateHealth() void Creature::DoFleeToGetAssistance() { - if (!getVictim()) + if (!GetVictim()) return; if (HasAuraType(SPELL_AURA_PREVENTS_FLEEING)) @@ -673,7 +673,7 @@ void Creature::DoFleeToGetAssistance() CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); - Trinity::NearestAssistCreatureInCreatureRangeCheck u_check(this, getVictim(), radius); + Trinity::NearestAssistCreatureInCreatureRangeCheck u_check(this, GetVictim(), radius); Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck> searcher(this, creature, u_check); TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); @@ -684,7 +684,7 @@ void Creature::DoFleeToGetAssistance() UpdateSpeed(MOVE_RUN, false); if (!creature) - //SetFeared(true, getVictim()->GetGUID(), 0, sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); + //SetFeared(true, GetVictim()->GetGUID(), 0, sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); /// @todo use 31365 SetControlled(true, UNIT_STATE_FLEEING); else @@ -789,7 +789,7 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 displayID = GetNativeDisplayId(); CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID); - if (minfo && !isTotem()) // Cancel load if no model defined or if totem + if (minfo && !IsTotem()) // Cancel load if no model defined or if totem { SetDisplayId(displayID); SetNativeDisplayId(displayID); @@ -799,7 +799,7 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, LastUsedScriptID = GetCreatureTemplate()->ScriptID; /// @todo Replace with spell, handle from DB - if (isSpiritHealer() || isSpiritGuide()) + if (IsSpiritHealer() || IsSpiritGuide()) { m_serverSideVisibility.SetValue(SERVERSIDE_VISIBILITY_GHOST, GHOST_VISIBILITY_GHOST); m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GHOST, GHOST_VISIBILITY_GHOST); @@ -813,17 +813,17 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, void Creature::InitializeReactState() { - if (isTotem() || isTrigger() || GetCreatureType() == CREATURE_TYPE_CRITTER || isSpiritService()) + if (IsTotem() || IsTrigger() || GetCreatureType() == CREATURE_TYPE_CRITTER || IsSpiritService()) SetReactState(REACT_PASSIVE); else SetReactState(REACT_AGGRESSIVE); - /*else if (isCivilian()) + /*else if (IsCivilian()) SetReactState(REACT_DEFENSIVE);*/; } bool Creature::isCanInteractWithBattleMaster(Player* player, bool msg) const { - if (!isBattleMaster()) + if (!IsBattleMaster()) return false; BattlegroundTypeId bgTypeId = sBattlegroundMgr->GetBattleMasterBG(GetEntry()); @@ -1020,7 +1020,7 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) void Creature::SelectLevel(const CreatureTemplate* cinfo) { - uint32 rank = isPet()? 0 : cinfo->rank; + uint32 rank = IsPet()? 0 : cinfo->rank; // level uint8 minlevel = std::min(cinfo->maxlevel, cinfo->minlevel); @@ -1326,7 +1326,7 @@ bool Creature::IsInvisibleDueToDespawn() const if (Unit::IsInvisibleDueToDespawn()) return true; - if (isAlive() || m_corpseRemoveTime > time(NULL)) + if (IsAlive() || m_corpseRemoveTime > time(NULL)) return false; return true; @@ -1340,9 +1340,9 @@ bool Creature::CanAlwaysSee(WorldObject const* obj) const return false; } -bool Creature::canStartAttack(Unit const* who, bool force) const +bool Creature::CanStartAttack(Unit const* who, bool force) const { - if (isCivilian()) + if (IsCivilian()) return false; if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC)) @@ -1363,7 +1363,7 @@ bool Creature::canStartAttack(Unit const* who, bool force) const if (!_IsTargetAcceptable(who)) return false; - if (who->isInCombat() && IsWithinDist(who, ATTACK_DISTANCE)) + if (who->IsInCombat() && IsWithinDist(who, ATTACK_DISTANCE)) if (Unit* victim = who->getAttackerForHelper()) if (IsWithinDistInMap(victim, sWorld->getFloatConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS))) force = true; @@ -1372,7 +1372,7 @@ bool Creature::canStartAttack(Unit const* who, bool force) const return false; } - if (!canCreatureAttack(who, force)) + if (!CanCreatureAttack(who, force)) return false; return IsWithinLOSInMap(who); @@ -1434,7 +1434,7 @@ void Creature::setDeathState(DeathState s) setActive(false); - if (!isPet() && GetCreatureTemplate()->SkinLootId) + if (!IsPet() && GetCreatureTemplate()->SkinLootId) if (LootTemplates_Skinning.HaveLootFor(GetCreatureTemplate()->SkinLootId)) if (hasLootRecipient()) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); @@ -1456,7 +1456,7 @@ void Creature::setDeathState(DeathState s) } else if (s == JUST_RESPAWNED) { - //if (isPet()) + //if (IsPet()) // setActive(true); SetFullHealth(); SetLootRecipient(NULL); @@ -1482,7 +1482,7 @@ void Creature::Respawn(bool force) if (force) { - if (isAlive()) + if (IsAlive()) setDeathState(JUST_DIED); else if (getDeathState() != CORPSE) setDeathState(CORPSE); @@ -1545,7 +1545,7 @@ void Creature::ForcedDespawn(uint32 timeMSToDespawn) return; } - if (isAlive()) + if (IsAlive()) setDeathState(JUST_DIED); RemoveCorpse(false); @@ -1600,7 +1600,7 @@ bool Creature::IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) bool Creature::isElite() const { - if (isPet()) + if (IsPet()) return false; uint32 rank = GetCreatureTemplate()->rank; @@ -1609,7 +1609,7 @@ bool Creature::isElite() const bool Creature::isWorldBoss() const { - if (isPet()) + if (IsPet()) return false; return GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_BOSS; @@ -1790,7 +1790,7 @@ void Creature::SendAIReaction(AiReaction reactionType) void Creature::CallAssistance() { - if (!m_AlreadyCallAssistance && getVictim() && !isPet() && !isCharmed()) + if (!m_AlreadyCallAssistance && GetVictim() && !IsPet() && !IsCharmed()) { SetNoCallAssistance(true); @@ -1805,7 +1805,7 @@ void Creature::CallAssistance() Cell cell(p); cell.SetNoCreate(); - Trinity::AnyAssistCreatureInRangeCheck u_check(this, getVictim(), radius); + Trinity::AnyAssistCreatureInRangeCheck u_check(this, GetVictim(), radius); Trinity::CreatureListSearcher<Trinity::AnyAssistCreatureInRangeCheck> searcher(this, assistList, u_check); TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AnyAssistCreatureInRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); @@ -1815,7 +1815,7 @@ void Creature::CallAssistance() if (!assistList.empty()) { - AssistDelayEvent* e = new AssistDelayEvent(getVictim()->GetGUID(), *this); + AssistDelayEvent* e = new AssistDelayEvent(GetVictim()->GetGUID(), *this); while (!assistList.empty()) { // Pushing guids because in delay can happen some creature gets despawned => invalid pointer @@ -1830,14 +1830,14 @@ void Creature::CallAssistance() void Creature::CallForHelp(float radius) { - if (radius <= 0.0f || !getVictim() || isPet() || isCharmed()) + if (radius <= 0.0f || !GetVictim() || IsPet() || IsCharmed()) return; CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); - Trinity::CallOfHelpCreatureInRangeDo u_do(this, getVictim(), radius); + Trinity::CallOfHelpCreatureInRangeDo u_do(this, GetVictim(), radius); Trinity::CreatureWorker<Trinity::CallOfHelpCreatureInRangeDo> worker(this, u_do); TypeContainerVisitor<Trinity::CreatureWorker<Trinity::CallOfHelpCreatureInRangeDo>, GridTypeMapContainer > grid_creature_searcher(worker); @@ -1852,18 +1852,18 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction / return false; // we don't need help from zombies :) - if (!isAlive()) + if (!IsAlive()) return false; // we don't need help from non-combatant ;) - if (isCivilian()) + if (IsCivilian()) return false; if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC)) return false; // skip fighting creature - if (isInCombat()) + if (IsInCombat()) return false; // only free creature @@ -1904,7 +1904,7 @@ bool Creature::_IsTargetAcceptable(const Unit* target) const if (target->HasUnitState(UNIT_STATE_DIED)) { // guards can detect fake death - if (isGuard() && target->HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH)) + if (IsGuard() && target->HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH)) return true; else return false; @@ -1927,14 +1927,14 @@ bool Creature::_IsTargetAcceptable(const Unit* target) const void Creature::SaveRespawnTime() { - if (isSummon() || !m_DBTableGuid || (m_creatureData && !m_creatureData->dbData)) + if (IsSummon() || !m_DBTableGuid || (m_creatureData && !m_creatureData->dbData)) return; GetMap()->SaveCreatureRespawnTime(m_DBTableGuid, m_respawnTime); } // this should not be called by petAI or -bool Creature::canCreatureAttack(Unit const* victim, bool /*force*/) const +bool Creature::CanCreatureAttack(Unit const* victim, bool /*force*/) const { if (!victim->IsInMap(this)) return false; @@ -2087,12 +2087,12 @@ void Creature::SetInCombatWithZone() for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { this->SetInCombatWith(player); player->SetInCombatWith(this); @@ -2468,7 +2468,7 @@ float Creature::GetAggroRange(Unit const* target) const // Determines the aggro range for creatures (usually pets), used mainly for aggressive pet target selection. // Based on data from wowwiki due to lack of 3.3.5a data - if (target && this->isPet()) + if (target && this->IsPet()) { uint32 targetLevel = 0; diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index df4031f521f..d70a4268235 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -157,18 +157,18 @@ struct CreatureTemplate return SKILL_SKINNING; // normal case } - bool isExotic() const + bool IsExotic() const { return (type_flags & CREATURE_TYPEFLAGS_EXOTIC) != 0; } - bool isTameable(bool canTameExotic) const + bool IsTameable(bool canTameExotic) const { if (type != CREATURE_TYPE_BEAST || family == 0 || (type_flags & CREATURE_TYPEFLAGS_TAMEABLE) == 0) return false; // if can tame exotic then can tame any tameable - return canTameExotic || !isExotic(); + return canTameExotic || !IsExotic(); } }; @@ -470,12 +470,12 @@ class Creature : public Unit, public GridObject<Creature>, public MapCreature void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; } uint32 GetCorpseDelay() const { return m_corpseDelay; } - bool isRacialLeader() const { return GetCreatureTemplate()->RacialLeader; } - bool isCivilian() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN; } - bool isTrigger() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER; } - bool isGuard() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; } - bool canWalk() const { return GetCreatureTemplate()->InhabitType & INHABIT_GROUND; } - bool canSwim() const { return GetCreatureTemplate()->InhabitType & INHABIT_WATER; } + bool IsRacialLeader() const { return GetCreatureTemplate()->RacialLeader; } + bool IsCivilian() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN; } + bool IsTrigger() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER; } + bool IsGuard() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; } + bool CanWalk() const { return GetCreatureTemplate()->InhabitType & INHABIT_GROUND; } + bool CanSwim() const { return GetCreatureTemplate()->InhabitType & INHABIT_WATER; } bool CanFly() const { return GetCreatureTemplate()->InhabitType & INHABIT_AIR; } void SetReactState(ReactStates st) { m_reactState = st; } @@ -486,7 +486,7 @@ class Creature : public Unit, public GridObject<Creature>, public MapCreature /// @todo Rename these properly bool isCanInteractWithBattleMaster(Player* player, bool msg) const; bool isCanTrainingAndResetTalentsOf(Player* player) const; - bool canCreatureAttack(Unit const* victim, bool force = true) const; + bool CanCreatureAttack(Unit const* victim, bool force = true) const; bool IsImmunedToSpell(SpellInfo const* spellInfo) const; // override Unit::IsImmunedToSpell bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const; // override Unit::IsImmunedToSpellEffect bool isElite() const; @@ -596,7 +596,7 @@ class Creature : public Unit, public GridObject<Creature>, public MapCreature CreatureSpellCooldowns m_CreatureSpellCooldowns; CreatureSpellCooldowns m_CreatureCategoryCooldowns; - bool canStartAttack(Unit const* u, bool force) const; + bool CanStartAttack(Unit const* u, bool force) const; float GetAttackDistance(Unit const* player) const; float GetAggroRange(Unit const* target) const; diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 5b3f7a15d47..f8966ba1923 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -180,10 +180,10 @@ void CreatureGroup::MemberAttackStart(Creature* member, Unit* target) if (itr->first == member) continue; - if (!itr->first->isAlive()) + if (!itr->first->IsAlive()) continue; - if (itr->first->getVictim()) + if (itr->first->GetVictim()) continue; if (itr->first->IsValidAttackTarget(target) && itr->first->AI()) @@ -195,7 +195,7 @@ void CreatureGroup::FormationReset(bool dismiss) { for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { - if (itr->first != m_leader && itr->first->isAlive()) + if (itr->first != m_leader && itr->first->IsAlive()) { if (dismiss) itr->first->GetMotionMaster()->Initialize(); @@ -219,7 +219,7 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z) for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { Creature* member = itr->first; - if (member == m_leader || !member->isAlive() || member->getVictim()) + if (member == m_leader || !member->IsAlive() || member->GetVictim()) continue; float angle = itr->second->follow_angle; diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 4e21faf2a6c..b14d74edf37 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -68,7 +68,7 @@ void TempSummon::Update(uint32 diff) } case TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT: { - if (!isInCombat()) + if (!IsInCombat()) { if (m_timer <= diff) { @@ -127,7 +127,7 @@ void TempSummon::Update(uint32 diff) return; } - if (!isInCombat()) + if (!IsInCombat()) { if (m_timer <= diff) { @@ -150,7 +150,7 @@ void TempSummon::Update(uint32 diff) return; } - if (!isInCombat() && isAlive()) + if (!IsInCombat() && IsAlive()) { if (m_timer <= diff) { @@ -173,7 +173,7 @@ void TempSummon::Update(uint32 diff) void TempSummon::InitStats(uint32 duration) { - ASSERT(!isPet()); + ASSERT(!IsPet()); m_timer = duration; m_lifetime = duration; @@ -183,7 +183,7 @@ void TempSummon::InitStats(uint32 duration) Unit* owner = GetSummoner(); - if (owner && isTrigger() && m_spells[0]) + if (owner && IsTrigger() && m_spells[0]) { setFaction(owner->getFaction()); SetLevel(owner->getLevel()); @@ -202,7 +202,7 @@ void TempSummon::InitStats(uint32 duration) if (owner->m_SummonSlot[slot] && owner->m_SummonSlot[slot] != GetGUID()) { Creature* oldSummon = GetMap()->GetCreature(owner->m_SummonSlot[slot]); - if (oldSummon && oldSummon->isSummon()) + if (oldSummon && oldSummon->IsSummon()) oldSummon->ToTempSummon()->UnSummon(); } owner->m_SummonSlot[slot] = GetGUID(); @@ -242,8 +242,8 @@ void TempSummon::UnSummon(uint32 msTime) return; } - //ASSERT(!isPet()); - if (isPet()) + //ASSERT(!IsPet()); + if (IsPet()) { ((Pet*)this)->Remove(PET_SAVE_NOT_IN_SLOT); ASSERT(!IsInWorld()); @@ -314,7 +314,7 @@ void Minion::RemoveFromWorld() bool Minion::IsGuardianPet() const { - return isPet() || (m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET); + return IsPet() || (m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET); } Guardian::Guardian(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject) : Minion(properties, owner, isWorldObject) @@ -380,7 +380,7 @@ void Puppet::Update(uint32 time) //check if caster is channelling? if (IsInWorld()) { - if (!isAlive()) + if (!IsAlive()) { UnSummon(); /// @todo why long distance .die does not remove it diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 8d15e6ab39a..07a3c0412d2 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -303,7 +303,7 @@ void GameObject::Update(uint32 diff) m_cooldownTime = time(NULL) + 10; // Hardcoded tooltip value else if (Unit* owner = GetOwner()) { - if (owner->isInCombat()) + if (owner->IsInCombat()) m_cooldownTime = time(NULL) + goInfo->trap.startDelay; } m_lootState = GO_READY; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 96248f067de..eae333bc4c8 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -243,7 +243,7 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c } if (Unit const* unit = ToUnit()) - if (unit->getVictim()) + if (unit->GetVictim()) flags |= UPDATEFLAG_HAS_TARGET; ByteBuffer buf(500); @@ -488,7 +488,7 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const if (flags & UPDATEFLAG_HAS_TARGET) { - ObjectGuid victimGuid = self->getVictim()->GetGUID(); // checked in BuildCreateUpdateBlockForPlayer + ObjectGuid victimGuid = self->GetVictim()->GetGUID(); // checked in BuildCreateUpdateBlockForPlayer data->WriteBit(victimGuid[2]); data->WriteBit(victimGuid[7]); data->WriteBit(victimGuid[0]); @@ -663,7 +663,7 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const if (flags & UPDATEFLAG_HAS_TARGET) { - ObjectGuid victimGuid = self->getVictim()->GetGUID(); // checked in BuildCreateUpdateBlockForPlayer + ObjectGuid victimGuid = self->GetVictim()->GetGUID(); // checked in BuildCreateUpdateBlockForPlayer data->WriteByteSeq(victimGuid[4]); data->WriteByteSeq(victimGuid[0]); data->WriteByteSeq(victimGuid[3]); @@ -710,7 +710,7 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* { if (!go->IsDynTransport()) { - if (go->ActivateToQuest(target) || target->isGameMaster()) + if (go->ActivateToQuest(target) || target->IsGameMaster()) IsActivateToQuest = true; if (go->GetGoArtKit()) @@ -721,7 +721,7 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* { if (!go->IsTransport()) { - if (go->ActivateToQuest(target) || target->isGameMaster()) + if (go->ActivateToQuest(target) || target->IsGameMaster()) IsActivateToQuest = true; updateMask->SetBit(GAMEOBJECT_BYTES_1); @@ -759,7 +759,7 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* if (GetTypeId() == TYPEID_UNIT) { - if (!target->canSeeSpellClickOn(this->ToCreature())) + if (!target->CanSeeSpellClickOn(this->ToCreature())) appendValue &= ~UNIT_NPC_FLAG_SPELLCLICK; } @@ -787,7 +787,7 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* // Gamemasters should be always able to select units - remove not selectable flag else if (index == UNIT_FIELD_FLAGS) { - if (target->isGameMaster()) + if (target->IsGameMaster()) *data << (m_uint32Values[index] & ~UNIT_FLAG_NOT_SELECTABLE); else *data << m_uint32Values[index]; @@ -811,7 +811,7 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* if (cinfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) { - if (target->isGameMaster()) + if (target->IsGameMaster()) { if (cinfo->Modelid1) *data << cinfo->Modelid1;//Modelid1 is a visible model for gms @@ -872,8 +872,8 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* { if (unit->IsControlledByPlayer() && target != this && sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && unit->IsInRaidWith(target)) { - FactionTemplateEntry const* ft1 = unit->getFactionTemplateEntry(); - FactionTemplateEntry const* ft2 = target->getFactionTemplateEntry(); + FactionTemplateEntry const* ft1 = unit->GetFactionTemplateEntry(); + FactionTemplateEntry const* ft2 = target->GetFactionTemplateEntry(); if (ft1 && ft2 && !ft1->IsFriendlyTo(*ft2)) { if (index == UNIT_FIELD_BYTES_2) @@ -916,19 +916,19 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* switch (go->GetGoType()) { case GAMEOBJECT_TYPE_CHEST: - if (target->isGameMaster()) + if (target->IsGameMaster()) *data << uint16(GO_DYNFLAG_LO_ACTIVATE); else *data << uint16(GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE); break; case GAMEOBJECT_TYPE_GENERIC: - if (target->isGameMaster()) + if (target->IsGameMaster()) *data << uint16(0); else *data << uint16(GO_DYNFLAG_LO_SPARKLE); break; case GAMEOBJECT_TYPE_GOOBER: - if (target->isGameMaster()) + if (target->IsGameMaster()) *data << uint16(GO_DYNFLAG_LO_ACTIVATE); else *data << uint16(GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE); @@ -2054,7 +2054,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const // non swim unit must be at ground (mostly speedup, because it don't must be in water and water level check less fast if (!ToCreature()->CanFly()) { - bool canSwim = ToCreature()->canSwim(); + bool canSwim = ToCreature()->CanSwim(); float ground_z = z; float max_z = canSwim ? GetBaseMap()->GetWaterOrGroundLevel(x, y, z, &ground_z, !ToUnit()->HasAuraType(SPELL_AURA_WATER_WALK)) @@ -2151,7 +2151,7 @@ float WorldObject::GetSightRange(const WorldObject* target) const return 0.0f; } -bool WorldObject::canSeeOrDetect(WorldObject const* obj, bool ignoreStealth, bool distanceCheck) const +bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, bool distanceCheck) const { if (this == obj) return true; @@ -2468,8 +2468,8 @@ void WorldObject::MonsterYellToZone(int32 textId, uint32 language, uint64 Target Map::PlayerList const& pList = GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) - if (itr->getSource()->GetZoneId() == zoneid) - say_do(itr->getSource()); + if (itr->GetSource()->GetZoneId() == zoneid) + say_do(itr->GetSource()); } void WorldObject::MonsterTextEmote(const char* text, uint64 TargetGuid, bool IsBossEmote) @@ -2924,7 +2924,7 @@ namespace Trinity float x, y, z; - if (!c->isAlive() || c->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED) || + if (!c->IsAlive() || c->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED) || !c->GetMotionMaster()->GetDestination(x, y, z)) { x = c->GetPositionX(); @@ -3341,7 +3341,7 @@ struct WorldObjectChangeAccumulator Player* source = NULL; for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - source = iter->getSource(); + source = iter->GetSource(); BuildPacket(source); @@ -3359,7 +3359,7 @@ struct WorldObjectChangeAccumulator Creature* source = NULL; for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - source = iter->getSource(); + source = iter->GetSource(); if (!source->GetSharedVisionList().empty()) { SharedVisionList::const_iterator it = source->GetSharedVisionList().begin(); @@ -3374,7 +3374,7 @@ struct WorldObjectChangeAccumulator DynamicObject* source = NULL; for (DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - source = iter->getSource(); + source = iter->GetSource(); uint64 guid = source->GetCasterGUID(); if (IS_PLAYER_GUID(guid)) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index a72f4fcf3e4..427d5a91afd 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -685,7 +685,7 @@ class WorldObject : public Object, public WorldLocation float GetGridActivationRange() const; float GetVisibilityRange() const; float GetSightRange(WorldObject const* target = NULL) const; - bool canSeeOrDetect(WorldObject const* obj, bool ignoreStealth = false, bool distanceCheck = false) const; + bool CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth = false, bool distanceCheck = false) const; FlaggedValuesArray32<int32, uint32, StealthType, TOTAL_STEALTH_TYPES> m_stealth; FlaggedValuesArray32<int32, uint32, StealthType, TOTAL_STEALTH_TYPES> m_stealthDetect; diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index ce564bd9090..55043537daa 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -162,7 +162,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c if (petType == HUNTER_PET) { CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(petEntry); - if (!creatureInfo || !creatureInfo->isTameable(owner->CanTameExoticPets())) + if (!creatureInfo || !creatureInfo->IsTameable(owner->CanTameExoticPets())) return false; } @@ -646,7 +646,7 @@ void Creature::Regenerate(Powers power) if (Powers((*i)->GetMiscValue()) == power) AddPct(addvalue, (*i)->GetAmount()); - addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (isHunterPet()? PET_FOCUS_REGEN_INTERVAL : CREATURE_REGEN_INTERVAL) / (5 * IN_MILLISECONDS); + addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (IsHunterPet()? PET_FOCUS_REGEN_INTERVAL : CREATURE_REGEN_INTERVAL) / (5 * IN_MILLISECONDS); ModifyPower(power, int32(addvalue)); } @@ -664,7 +664,7 @@ void Pet::GivePetXP(uint32 xp) if (xp < 1) return; - if (!isAlive()) + if (!IsAlive()) return; uint8 maxlevel = std::min((uint8)sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL), GetOwner()->getLevel()); @@ -789,7 +789,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) //Determine pet type PetType petType = MAX_PET_TYPE; - if (isPet() && GetOwner()->GetTypeId() == TYPEID_PLAYER) + if (IsPet() && GetOwner()->GetTypeId() == TYPEID_PLAYER) { if (GetOwner()->getClass() == CLASS_WARLOCK || GetOwner()->getClass() == CLASS_SHAMAN // Fire Elemental diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 642da3e8d95..e8faa8e579a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -463,8 +463,8 @@ inline void KillRewarder::_InitGroupData() { // 2. In case when player is in group, initialize variables necessary for group calculations: for (GroupReference* itr = _group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) - if (member->isAlive() && member->IsAtGroupRewardDistance(_victim)) + if (Player* member = itr->GetSource()) + if (member->IsAlive() && member->IsAtGroupRewardDistance(_victim)) { const uint8 lvl = member->getLevel(); // 2.1. _count - number of alive group members within reward distance; @@ -502,7 +502,7 @@ inline void KillRewarder::_InitXP(Player* player) inline void KillRewarder::_RewardHonor(Player* player) { // Rewarded player must be alive. - if (player->isAlive()) + if (player->IsAlive()) player->RewardHonor(_victim, _count, -1, true); } @@ -514,7 +514,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate) // 4.2.1. If player is in group, adjust XP: // * set to 0 if player's level is more than maximum level of not gray member; // * cut XP in half if _isFullXP is false. - if (_maxNotGrayMember && player->isAlive() && + if (_maxNotGrayMember && player->IsAlive() && _maxNotGrayMember->getLevel() >= player->getLevel()) xp = _isFullXP ? uint32(xp * rate) : // Reward FULL XP if all group members are not gray. @@ -551,7 +551,7 @@ inline void KillRewarder::_RewardReputation(Player* player, float rate) inline void KillRewarder::_RewardKillCredit(Player* player) { // 4.4. Give kill credit (player must not be in group, or he must be alive or without corpse). - if (!_group || player->isAlive() || !player->GetCorpse()) + if (!_group || player->IsAlive() || !player->GetCorpse()) if (_victim->GetTypeId() == TYPEID_UNIT) player->KilledMonster(_victim->ToCreature()->GetCreatureTemplate(), _victim->GetGUID()); } @@ -610,7 +610,7 @@ void KillRewarder::_RewardGroup() // 3.1.3. Reward each group member (even dead or corpse) within reward distance. for (GroupReference* itr = _group->GetFirstMember(); itr != NULL; itr = itr->next()) { - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) { if (member->IsAtGroupRewardDistance(_victim)) { @@ -1298,7 +1298,7 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage) uint32 final_damage = DealDamage(this, damage, NULL, SELF_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - if (!isAlive()) + if (!IsAlive()) { if (type == DAMAGE_FALL) // DealDamage not apply item durability loss at self damage { @@ -1322,7 +1322,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer) return MINUTE * IN_MILLISECONDS; case BREATH_TIMER: { - if (!isAlive() || HasAuraType(SPELL_AURA_WATER_BREATHING) || GetSession()->GetSecurity() >= AccountTypes(sWorld->getIntConfig(CONFIG_DISABLE_BREATHING))) + if (!IsAlive() || HasAuraType(SPELL_AURA_WATER_BREATHING) || GetSession()->GetSecurity() >= AccountTypes(sWorld->getIntConfig(CONFIG_DISABLE_BREATHING))) return DISABLED_MIRROR_TIMER; int32 UnderWaterTime = 3 * MINUTE * IN_MILLISECONDS; AuraEffectList const& mModWaterBreathing = GetAuraEffectsByType(SPELL_AURA_MOD_WATER_BREATHING); @@ -1332,7 +1332,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer) } case FIRE_TIMER: { - if (!isAlive()) + if (!IsAlive()) return DISABLED_MIRROR_TIMER; return 1 * IN_MILLISECONDS; } @@ -1395,7 +1395,7 @@ void Player::HandleDrowning(uint32 time_diff) int32 UnderWaterTime = getMaxTimer(BREATH_TIMER); // Need breath regen m_MirrorTimer[BREATH_TIMER]+=10*time_diff; - if (m_MirrorTimer[BREATH_TIMER] >= UnderWaterTime || !isAlive()) + if (m_MirrorTimer[BREATH_TIMER] >= UnderWaterTime || !IsAlive()) StopMirrorTimer(BREATH_TIMER); else if (m_MirrorTimerFlagsLast & UNDERWATER_INWATER) SendMirrorTimer(BREATH_TIMER, UnderWaterTime, m_MirrorTimer[BREATH_TIMER], 10); @@ -1417,7 +1417,7 @@ void Player::HandleDrowning(uint32 time_diff) if (m_MirrorTimer[FATIGUE_TIMER] < 0) { m_MirrorTimer[FATIGUE_TIMER]+= 1*IN_MILLISECONDS; - if (isAlive()) // Calculate and deal damage + if (IsAlive()) // Calculate and deal damage { uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1); EnvironmentalDamage(DAMAGE_EXHAUSTED, damage); @@ -1433,7 +1433,7 @@ void Player::HandleDrowning(uint32 time_diff) { int32 DarkWaterTime = getMaxTimer(FATIGUE_TIMER); m_MirrorTimer[FATIGUE_TIMER]+=10*time_diff; - if (m_MirrorTimer[FATIGUE_TIMER] >= DarkWaterTime || !isAlive()) + if (m_MirrorTimer[FATIGUE_TIMER] >= DarkWaterTime || !IsAlive()) StopMirrorTimer(FATIGUE_TIMER); else if (m_MirrorTimerFlagsLast & UNDERWARER_INDARKWATER) SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10); @@ -1574,9 +1574,9 @@ void Player::Update(uint32 p_time) UpdateAfkReport(now); - if (isCharmed()) + if (IsCharmed()) if (Unit* charmer = GetCharmer()) - if (charmer->GetTypeId() == TYPEID_UNIT && charmer->isAlive()) + if (charmer->GetTypeId() == TYPEID_UNIT && charmer->IsAlive()) UpdateCharmedAI(); // Update items that have just a limited lifetime @@ -1624,7 +1624,7 @@ void Player::Update(uint32 p_time) if (HasUnitState(UNIT_STATE_MELEE_ATTACKING) && !HasUnitState(UNIT_STATE_CASTING)) { - if (Unit* victim = getVictim()) + if (Unit* victim = GetVictim()) { // default combat reach 10 /// @todo add weapon, skill check @@ -1747,7 +1747,7 @@ void Player::Update(uint32 p_time) m_timeSyncTimer -= p_time; } - if (isAlive()) + if (IsAlive()) { m_regenTimer += p_time; RegenerateAll(); @@ -1838,7 +1838,7 @@ void Player::Update(uint32 p_time) //we should execute delayed teleports only for alive(!) players //because we don't want player's ghost teleported from graveyard - if (IsHasDelayedTeleport() && isAlive()) + if (IsHasDelayedTeleport() && IsAlive()) TeleportTo(m_teleport_dest, m_teleport_options); } @@ -1846,7 +1846,7 @@ void Player::setDeathState(DeathState s) { uint32 ressSpellId = 0; - bool cur = isAlive(); + bool cur = IsAlive(); if (s == JUST_DIED) { @@ -1886,7 +1886,7 @@ void Player::setDeathState(DeathState s) if (s == JUST_DIED && cur && ressSpellId) SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId); - if (isAlive() && !cur) + if (IsAlive() && !cur) //clear aura case after resurrection by another way (spells will be applied before next death) SetUInt32Value(PLAYER_SELF_RES_SPELL, 0); } @@ -2214,7 +2214,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati } else { - if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster() && !HasSpell(50977)) + if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !IsGameMaster() && !HasSpell(50977)) return false; // far teleport to another map @@ -2528,7 +2528,7 @@ void Player::RegenerateAll() if (m_regenTimerCount >= 2000) { // Not in combat or they have regeneration - if (!isInCombat() || IsPolymorphed() || m_baseHealthRegen || + if (!IsInCombat() || IsPolymorphed() || m_baseHealthRegen || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT) || HasAuraType(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT)) { @@ -2581,7 +2581,7 @@ void Player::Regenerate(Powers power) { float ManaIncreaseRate = sWorld->getRate(RATE_POWER_MANA); - if (isInCombat()) // Trinity Updates Mana in intervals of 2s, which is correct + if (IsInCombat()) // Trinity Updates Mana in intervals of 2s, which is correct addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER) * ManaIncreaseRate * ((0.001f * m_regenTimer) + CalculatePct(0.001f, spellHaste)); else addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER) * ManaIncreaseRate * ((0.001f * m_regenTimer) + CalculatePct(0.001f, spellHaste)); @@ -2589,7 +2589,7 @@ void Player::Regenerate(Powers power) break; case POWER_RAGE: // Regenerate rage { - if (!isInCombat() && !HasAuraType(SPELL_AURA_INTERRUPT_REGEN)) + if (!IsInCombat() && !HasAuraType(SPELL_AURA_INTERRUPT_REGEN)) { float RageDecreaseRate = sWorld->getRate(RATE_POWER_RAGE_LOSS); addvalue += -25 * RageDecreaseRate / meleeHaste; // 2.5 rage by tick (= 2 seconds => 1.25 rage/sec) @@ -2604,7 +2604,7 @@ void Player::Regenerate(Powers power) break; case POWER_RUNIC_POWER: { - if (!isInCombat() && !HasAuraType(SPELL_AURA_INTERRUPT_REGEN)) + if (!IsInCombat() && !HasAuraType(SPELL_AURA_INTERRUPT_REGEN)) { float RunicPowerDecreaseRate = sWorld->getRate(RATE_POWER_RUNICPOWER_LOSS); addvalue += -30 * RunicPowerDecreaseRate; // 3 RunicPower by tick @@ -2613,7 +2613,7 @@ void Player::Regenerate(Powers power) break; case POWER_HOLY_POWER: // Regenerate holy power { - if (!isInCombat()) + if (!IsInCombat()) addvalue += -1.0f; // remove 1 each 10 sec } break; @@ -2634,7 +2634,7 @@ void Player::Regenerate(Powers power) AddPct(addvalue, (*i)->GetAmount()); // Butchery requires combat for this effect - if (power != POWER_RUNIC_POWER || isInCombat()) + if (power != POWER_RUNIC_POWER || IsInCombat()) addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * ((power != POWER_ENERGY) ? m_regenTimerCount : m_regenTimer) / (5 * IN_MILLISECONDS); } @@ -2701,10 +2701,10 @@ void Player::RegenerateHealth() if (IsPolymorphed()) addvalue = (float)GetMaxHealth()/3; // normal regen case (maybe partly in combat case) - else if (!isInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT)) + else if (!IsInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT)) { addvalue = HealthIncreaseRate; - if (!isInCombat()) + if (!IsInCombat()) { if (getLevel() < 15) addvalue = (0.20f*((float)GetMaxHealth())/getLevel()*HealthIncreaseRate); @@ -2768,9 +2768,9 @@ bool Player::CanInteractWithQuestGiver(Object* questGiver) case TYPEID_GAMEOBJECT: return GetGameObjectIfCanInteractWith(questGiver->GetGUID(), GAMEOBJECT_TYPE_QUESTGIVER) != NULL; case TYPEID_PLAYER: - return isAlive() && questGiver->ToPlayer()->isAlive(); + return IsAlive() && questGiver->ToPlayer()->IsAlive(); case TYPEID_ITEM: - return isAlive(); + return IsAlive(); default: break; } @@ -2786,7 +2786,7 @@ Creature* Player::GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask) if (!IsInWorld()) return NULL; - if (isInFlight()) + if (IsInFlight()) return NULL; // exist (we need look pets also for some interaction (quest/etc) @@ -2795,11 +2795,11 @@ Creature* Player::GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask) return NULL; // Deathstate checks - if (!isAlive() && !(creature->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_GHOST)) + if (!IsAlive() && !(creature->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_GHOST)) return NULL; // alive or spirit healer - if (!creature->isAlive() && !(creature->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_DEAD_INTERACT)) + if (!creature->IsAlive() && !(creature->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_DEAD_INTERACT)) return NULL; // appropriate npc type @@ -3036,7 +3036,7 @@ void Player::GiveXP(uint32 xp, Unit* victim, float group_rate) if (xp < 1) return; - if (!isAlive() && !GetBattlegroundId()) + if (!IsAlive() && !GetBattlegroundId()) return; if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN)) @@ -4563,7 +4563,7 @@ bool Player::ResetTalents(bool no_cost) /* when prev line will dropped use next line if (Pet* pet = GetPet()) { - if (pet->getPetType() == HUNTER_PET && !pet->GetCreatureTemplate()->isTameable(CanTameExoticPets())) + if (pet->getPetType() == HUNTER_PET && !pet->GetCreatureTemplate()->IsTameable(CanTameExoticPets())) RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } */ @@ -5546,7 +5546,7 @@ void Player::RepopAtGraveyard() AreaTableEntry const* zone = GetAreaEntryByAreaID(GetAreaId()); // Such zones are considered unreachable as a ghost and the player must be automatically revived - if ((!isAlive() && zone && zone->flags & AREA_FLAG_NEED_FLY) || GetTransport() || GetPositionZ() < (zone ? zone->MaxDepth : -500.0f)) + if ((!IsAlive() && zone && zone->flags & AREA_FLAG_NEED_FLY) || GetTransport() || GetPositionZ() < (zone ? zone->MaxDepth : -500.0f)) { ResurrectPlayer(0.5f); SpawnCorpseBones(); @@ -6795,10 +6795,10 @@ void Player::SendMovieStart(uint32 MovieId) void Player::CheckAreaExploreAndOutdoor() { - if (!isAlive()) + if (!IsAlive()) return; - if (isInFlight()) + if (IsInFlight()) return; bool isOutdoor; @@ -7187,7 +7187,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto } else { - if (!victim->ToCreature()->isRacialLeader()) + if (!victim->ToCreature()->IsRacialLeader()) return false; honor_f = 100.0f; // ??? need more info @@ -7903,7 +7903,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) // remove items with area/map limitations (delete only for alive player to allow back in ghost mode) // if player resurrected at teleport this will be applied in resurrect code - if (isAlive()) + if (IsAlive()) DestroyZoneLimitedItem(true, newZone); // check some item equip limitations (in result lost CanTitanGrip at talent reset, for example) @@ -7954,7 +7954,7 @@ void Player::CheckDuelDistance(time_t currTime) bool Player::IsOutdoorPvPActive() { - return isAlive() && !HasInvisibilityAura() && !HasStealthAura() && IsPvP() && !HasUnitMovementFlag(MOVEMENTFLAG_FLYING) && !isInFlight(); + return IsAlive() && !HasInvisibilityAura() && !HasStealthAura() && IsPvP() && !HasUnitMovementFlag(MOVEMENTFLAG_FLYING) && !IsInFlight(); } void Player::DuelComplete(DuelCompleteType type) @@ -8591,7 +8591,7 @@ void Player::UpdateEquipSpellsAtFormChange() } void Player::CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx) { - if (!target || !target->isAlive() || target == this) + if (!target || !target->IsAlive() || target == this) return; for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) @@ -9162,7 +9162,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type) Creature* creature = GetMap()->GetCreature(guid); // must be in range and creature must be alive for pickpocket and must be dead for another loot - if (!creature || creature->isAlive() != (loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this, INTERACTION_DISTANCE)) + if (!creature || creature->IsAlive() != (loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this, INTERACTION_DISTANCE)) { SendLootRelease(guid); return; @@ -11428,7 +11428,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool // - in-progress arenas if (!pProto->CanChangeEquipStateInCombat()) { - if (isInCombat()) + if (IsInCombat()) return EQUIP_ERR_NOT_IN_COMBAT; if (Battleground* bg = GetBattleground()) @@ -11436,7 +11436,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool return EQUIP_ERR_NOT_DURING_ARENA_MATCH; } - if (isInCombat()&& (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer != 0) + if (IsInCombat()&& (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer != 0) return EQUIP_ERR_CLIENT_LOCKED_OUT; // maybe exist better err if (IsNonMeleeSpellCasted(false)) @@ -11583,7 +11583,7 @@ InventoryResult Player::CanUnequipItem(uint16 pos, bool swap) const // - in-progress arenas if (!pProto->CanChangeEquipStateInCombat()) { - if (isInCombat()) + if (IsInCombat()) return EQUIP_ERR_NOT_IN_COMBAT; if (Battleground* bg = GetBattleground()) @@ -11789,7 +11789,7 @@ InventoryResult Player::CanUseItem(Item* pItem, bool not_loading) const { TC_LOG_DEBUG(LOG_FILTER_PLAYER_ITEMS, "STORAGE: CanUseItem item = %u", pItem->GetEntry()); - if (!isAlive() && not_loading) + if (!IsAlive() && not_loading) return EQUIP_ERR_PLAYER_DEAD; //if (isStunned()) @@ -12155,7 +12155,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update) { VisualizeItem(slot, pItem); - if (isAlive()) + if (IsAlive()) { ItemTemplate const* pProto = pItem->GetTemplate(); @@ -12165,7 +12165,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update) _ApplyItemMods(pItem, slot, true); - if (pProto && isInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer == 0) + if (pProto && IsInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer == 0) { uint32 cooldownSpell = getClass() == CLASS_ROGUE ? 6123 : 6119; SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(cooldownSpell); @@ -12932,7 +12932,7 @@ void Player::SwapItem(uint16 src, uint16 dst) TC_LOG_DEBUG(LOG_FILTER_PLAYER_ITEMS, "STORAGE: SwapItem bag = %u, slot = %u, item = %u", dstbag, dstslot, pSrcItem->GetEntry()); - if (!isAlive()) + if (!IsAlive()) { SendEquipError(EQUIP_ERR_PLAYER_DEAD, pSrcItem, pDstItem); return; @@ -14439,6 +14439,10 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool canTalk = false; break; case GOSSIP_OPTION_TRAINER: + if (getClass() != creature->GetCreatureTemplate()->trainer_class && creature->GetCreatureTemplate()->trainer_type == TRAINER_TYPE_CLASS) + TC_LOG_ERROR(LOG_FILTER_SQL, "GOSSIP_OPTION_TRAINER:: Player %s (GUID: %u) request wrong gossip menu: %u with wrong class: %u at Creature: %s (Entry: %u, Trainer Class: %u)", + GetName().c_str(), GetGUIDLow(), menu->GetGossipMenu().GetMenuId(), getClass(), creature->GetName().c_str(), creature->GetEntry(), creature->GetCreatureTemplate()->trainer_class); + // no break; case GOSSIP_OPTION_GOSSIP: case GOSSIP_OPTION_SPIRITGUIDE: case GOSSIP_OPTION_INNKEEPER: @@ -16152,7 +16156,7 @@ void Player::GroupEventHappens(uint32 questId, WorldObject const* pEventObject) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); // for any leave or dead (with not released body) group member at appropriate distance if (player && player->IsAtGroupRewardDistance(pEventObject) && !player->GetCorpse()) @@ -17566,7 +17570,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) // Spell code allow apply any auras to dead character in load time in aura/spell/item loading // Do now before stats re-calculation cleanup for ghost state unexpected auras - if (!isAlive()) + if (!IsAlive()) RemoveAllAurasOnDeath(); else RemoveAllAurasRequiringDeadTarget(); @@ -17893,7 +17897,7 @@ void Player::_LoadGlyphAuras() void Player::LoadCorpse() { - if (isAlive()) + if (IsAlive()) sObjectAccessor->ConvertCorpseForPlayer(GetGUID()); else { @@ -18032,7 +18036,7 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff) } CharacterDatabase.CommitTransaction(trans); } - //if (isAlive()) + //if (IsAlive()) _ApplyAllItemMods(); } @@ -18097,7 +18101,7 @@ Item* Player::_LoadItem(SQLTransaction& trans, uint32 zoneId, uint32 timeDiff, F PreparedStatement* stmt = NULL; // Do not allow to have item limited to another map/zone in alive state - if (isAlive() && item->IsLimitedToAnotherMapOrZone(GetMapId(), zoneId)) + if (IsAlive() && item->IsLimitedToAnotherMapOrZone(GetMapId(), zoneId)) { TC_LOG_DEBUG(LOG_FILTER_PLAYER_LOADING, "Player::_LoadInventory: player (GUID: %u, name: '%s', map: %u) has item (GUID: %u, entry: %u) limited to another map (%u). Deleting item.", GetGUIDLow(), GetName().c_str(), GetMapId(), item->GetGUIDLow(), item->GetEntry(), zoneId); @@ -18931,7 +18935,7 @@ void Player::ConvertInstancesToGroup(Player* player, Group* group, bool switchLe bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report) { - if (!isGameMaster() && ar) + if (!IsGameMaster() && ar) { uint8 LevelMin = 0; uint8 LevelMax = 0; @@ -19006,7 +19010,7 @@ bool Player::CheckInstanceLoginValid() if (!GetMap()) return false; - if (!GetMap()->IsDungeon() || isGameMaster()) + if (!GetMap()->IsDungeon() || IsGameMaster()) return true; if (GetMap()->IsRaid()) @@ -20376,7 +20380,7 @@ void Player::UpdateAfkReport(time_t currTime) void Player::UpdateContestedPvP(uint32 diff) { - if (!m_contestedPvPTimer||isInCombat()) + if (!m_contestedPvPTimer||IsInCombat()) return; if (m_contestedPvPTimer <= diff) { @@ -20631,7 +20635,7 @@ void Player::Whisper(const std::string& text, uint32 language, uint64 receiver) rPlayer->BuildPlayerChat(&data, CHAT_MSG_WHISPER_INFORM, _text, language); GetSession()->SendPacket(&data); - if (!isAcceptWhispers() && !isGameMaster() && !rPlayer->isGameMaster()) + if (!isAcceptWhispers() && !IsGameMaster() && !rPlayer->IsGameMaster()) { SetAcceptWhispers(true); ChatHandler(GetSession()).SendSysMessage(LANG_COMMAND_WHISPERON); @@ -20789,7 +20793,7 @@ void Player::VehicleSpellInitialize() WorldPacket data(SMSG_PET_SPELLS, 8 + 2 + 4 + 4 + 4 * 10 + 1 + 1 + cooldownCount * (4 + 2 + 4 + 4)); data << uint64(vehicle->GetGUID()); // Guid data << uint16(0); // Pet Family (0 for all vehicles) - data << uint32(vehicle->isSummon() ? vehicle->ToTempSummon()->GetTimer() : 0); // Duration + data << uint32(vehicle->IsSummon() ? vehicle->ToTempSummon()->GetTimer() : 0); // Duration // The following three segments are read by the client as one uint32 data << uint8(vehicle->GetReactState()); // React State data << uint8(0); // Command State @@ -21243,7 +21247,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc return false; // not let cheating with start flight in time of logout process || while in combat || has type state: stunned || has type state: root - if (GetSession()->isLogingOut() || isInCombat() || HasUnitState(UNIT_STATE_STUNNED) || HasUnitState(UNIT_STATE_ROOT)) + if (GetSession()->isLogingOut() || IsInCombat() || HasUnitState(UNIT_STATE_STUNNED) || HasUnitState(UNIT_STATE_ROOT)) { GetSession()->SendActivateTaxiReply(ERR_TAXIPLAYERBUSY); return false; @@ -21678,7 +21682,7 @@ bool Player::BuyCurrencyFromVendorSlot(uint64 vendorGuid, uint32 vendorSlot, uin // cheating attempt if (count < 1) count = 1; - if (!isAlive()) + if (!IsAlive()) return false; CurrencyTypesEntry const* proto = sCurrencyTypesStore.LookupEntry(currency); @@ -21809,7 +21813,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 if (slot > MAX_BAG_SIZE && slot != NULL_SLOT) return false; - if (!isAlive()) + if (!IsAlive()) return false; ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(item); @@ -21997,7 +22001,7 @@ uint32 Player::GetMaxPersonalArenaRatingRequirement(uint32 minarenaslot) const void Player::UpdateHomebindTime(uint32 time) { // GMs never get homebind timer online - if (m_InstanceValid || isGameMaster()) + if (m_InstanceValid || IsGameMaster()) { if (m_HomebindTimer) // instance valid, but timer not reset { @@ -22037,7 +22041,7 @@ void Player::UpdatePvPState(bool onlyFFA) { /// @todo should we always synchronize UNIT_FIELD_BYTES_2, 1 of controller and controlled? // no, we shouldn't, those are checked for affecting player by client - if (!pvpInfo.IsInNoPvPArea && !isGameMaster() + if (!pvpInfo.IsInNoPvPArea && !IsGameMaster() && (pvpInfo.IsInFFAPvPArea || sWorld->IsFFAPvPRealm())) { if (!HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP)) @@ -22240,7 +22244,7 @@ void Player::SendCooldownEvent(SpellInfo const* spellInfo, uint32 itemId /*= 0*/ void Player::UpdatePotionCooldown(Spell* spell) { // no potion used i combat or still in combat - if (!m_lastPotionId || isInCombat()) + if (!m_lastPotionId || IsInCombat()) return; // Call not from spell cast, send cooldown event for item spells if no in combat @@ -22491,7 +22495,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint) bg->RemovePlayerAtLeave(GetGUID(), teleportToEntryPoint, true); // call after remove to be sure that player resurrected for correct cast - if (bg->isBattleground() && !isGameMaster() && sWorld->getBoolConfig(CONFIG_BATTLEGROUND_CAST_DESERTER)) + if (bg->isBattleground() && !IsGameMaster() && sWorld->getBoolConfig(CONFIG_BATTLEGROUND_CAST_DESERTER)) { if (bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN) { @@ -22668,7 +22672,7 @@ inline void BeforeVisibilityDestroy(T* /*t*/, Player* /*p*/) template<> inline void BeforeVisibilityDestroy<Creature>(Creature* t, Player* p) { - if (p->GetPetGUID() == t->GetGUID() && t->ToCreature()->isPet()) + if (p->GetPetGUID() == t->GetGUID() && t->ToCreature()->IsPet()) ((Pet*)t)->Remove(PET_SAVE_NOT_IN_SLOT, true); } @@ -22676,7 +22680,7 @@ void Player::UpdateVisibilityOf(WorldObject* target) { if (HaveAtClient(target)) { - if (!canSeeOrDetect(target, false, true)) + if (!CanSeeOrDetect(target, false, true)) { if (target->GetTypeId() == TYPEID_UNIT) BeforeVisibilityDestroy<Creature>(target->ToCreature(), this); @@ -22691,7 +22695,7 @@ void Player::UpdateVisibilityOf(WorldObject* target) } else { - if (canSeeOrDetect(target, false, true)) + if (CanSeeOrDetect(target, false, true)) { //if (target->isType(TYPEMASK_UNIT) && ((Unit*)target)->m_Vehicle) // UpdateVisibilityOf(((Unit*)target)->m_Vehicle); @@ -22726,7 +22730,7 @@ void Player::UpdateTriggerVisibility() if (IS_CREATURE_GUID(*itr)) { Creature* obj = GetMap()->GetCreature(*itr); - if (!obj || !(obj->isTrigger() || obj->HasAuraType(SPELL_AURA_TRANSFORM))) // can transform into triggers + if (!obj || !(obj->IsTrigger() || obj->HasAuraType(SPELL_AURA_TRANSFORM))) // can transform into triggers continue; obj->BuildValuesUpdateBlockForPlayer(&udata, this); @@ -22740,10 +22744,10 @@ void Player::UpdateTriggerVisibility() void Player::SendInitialVisiblePackets(Unit* target) { SendAurasForTarget(target); - if (target->isAlive()) + if (target->IsAlive()) { - if (target->HasUnitState(UNIT_STATE_MELEE_ATTACKING) && target->getVictim()) - target->SendMeleeAttackStart(target->getVictim()); + if (target->HasUnitState(UNIT_STATE_MELEE_ATTACKING) && target->GetVictim()) + target->SendMeleeAttackStart(target->GetVictim()); } } @@ -22752,7 +22756,7 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<Unit*>& vi { if (HaveAtClient(target)) { - if (!canSeeOrDetect(target, false, true)) + if (!CanSeeOrDetect(target, false, true)) { BeforeVisibilityDestroy<T>(target, this); @@ -22766,7 +22770,7 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<Unit*>& vi } else //if (visibleNow.size() < 30 || target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsVehicle()) { - if (canSeeOrDetect(target, false, true)) + if (CanSeeOrDetect(target, false, true)) { //if (target->isType(TYPEMASK_UNIT) && ((Unit*)target)->m_Vehicle) // UpdateVisibilityOf(((Unit*)target)->m_Vehicle, data, visibleNow); @@ -23590,7 +23594,7 @@ bool Player::GetBGAccessByLevel(BattlegroundTypeId bgTypeId) const float Player::GetReputationPriceDiscount(Creature const* creature) const { - FactionTemplateEntry const* vendor_faction = creature->getFactionTemplateEntry(); + FactionTemplateEntry const* vendor_faction = creature->GetFactionTemplateEntry(); if (!vendor_faction || !vendor_faction->faction) return 1.0f; @@ -23731,7 +23735,7 @@ void Player::SummonIfPossible(bool agree) return; // stop taxi flight at summon - if (isInFlight()) + if (IsInFlight()) { GetMotionMaster()->MovementExpired(); CleanupAfterTaxiFlight(); @@ -23959,8 +23963,8 @@ bool Player::isHonorOrXPTarget(Unit const* victim) if (Creature const* const creature = victim->ToCreature()) { - if (creature->isTotem() || - creature->isPet() || + if (creature->IsTotem() || + creature->IsPet() || creature->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) return false; } @@ -23976,7 +23980,7 @@ bool Player::GetsRecruitAFriendBonus(bool forXP) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player) continue; @@ -24024,7 +24028,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player) continue; @@ -24032,7 +24036,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar continue; // member (alive or dead) or his corpse at req. distance // quest objectives updated only for alive group member or dead but with not released body - if (player->isAlive()|| !player->GetCorpse()) + if (player->IsAlive()|| !player->GetCorpse()) player->KilledMonsterCredit(creature_id, creature_guid); } } @@ -24045,7 +24049,7 @@ bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const if (!pRewardSource) return false; const WorldObject* player = GetCorpse(); - if (!player || isAlive()) + if (!player || IsAlive()) player = this; if (player->GetMapId() != pRewardSource->GetMapId() || player->GetInstanceId() != pRewardSource->GetInstanceId()) @@ -24059,7 +24063,7 @@ bool Player::IsAtRecruitAFriendDistance(WorldObject const* pOther) const if (!pOther) return false; const WorldObject* player = GetCorpse(); - if (!player || isAlive()) + if (!player || IsAlive()) player = this; if (player->GetMapId() != pOther->GetMapId() || player->GetInstanceId() != pOther->GetInstanceId()) @@ -24285,7 +24289,7 @@ Player* Player::GetNextRandomRaidMember(float radius) for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* Target = itr->getSource(); + Player* Target = itr->GetSource(); // IsHostileTo check duel and controlled by enemy if (Target && Target != this && IsWithinDistInMap(Target, radius) && @@ -24327,7 +24331,7 @@ PartyResult Player::CanUninviteFromGroup() const /// @todo Should also be sent when anyone has recently left combat, with an aprox ~5 seconds timer. for (GroupReference const* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) - if (itr->getSource() && itr->getSource()->isInCombat()) + if (itr->GetSource() && itr->GetSource()->IsInCombat()) return ERR_PARTY_LFG_BOOT_IN_COMBAT; /* Missing support for these types @@ -24448,7 +24452,7 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z) } // Allow travel in dark water on taxi or transport - if ((liquid_status.type_flags & MAP_LIQUID_TYPE_DARK_WATER) && !isInFlight() && !GetTransport()) + if ((liquid_status.type_flags & MAP_LIQUID_TYPE_DARK_WATER) && !IsInFlight() && !GetTransport()) m_MirrorTimerFlags |= UNDERWARER_INDARKWATER; else m_MirrorTimerFlags &= ~UNDERWARER_INDARKWATER; @@ -24561,7 +24565,7 @@ bool Player::CanUseBattlegroundObject(GameObject* gameobject) // It is possible to call this method with a null pointer, only skipping faction check. if (gameobject) { - FactionTemplateEntry const* playerFaction = getFactionTemplateEntry(); + FactionTemplateEntry const* playerFaction = GetFactionTemplateEntry(); FactionTemplateEntry const* faction = sFactionTemplateStore.LookupEntry(gameobject->GetUInt32Value(GAMEOBJECT_FACTION)); if (playerFaction && faction && !playerFaction->IsFriendlyTo(*faction)) @@ -24572,14 +24576,14 @@ bool Player::CanUseBattlegroundObject(GameObject* gameobject) // Note: Mount, stealth and invisibility will be removed when used return (!isTotalImmune() && // Damage immune !HasAura(SPELL_RECENTLY_DROPPED_FLAG) && // Still has recently held flag debuff - isAlive()); // Alive + IsAlive()); // Alive } bool Player::CanCaptureTowerPoint() { return (!HasStealthAura() && // not stealthed !HasInvisibilityAura() && // not invisible - isAlive()); // live player + IsAlive()); // live player } uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair, BarberShopStyleEntry const* newSkin) @@ -24736,10 +24740,10 @@ void Player::UpdateCharmedAI() } } - if (!charmer->isInCombat()) + if (!charmer->IsInCombat()) GetMotionMaster()->MoveFollow(charmer, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); - Unit* target = getVictim(); + Unit* target = GetVictim(); if (!target || !charmer->IsValidAttackTarget(target)) { target = charmer->SelectNearestTarget(); @@ -25249,7 +25253,7 @@ void Player::HandleFall(MovementInfo const& movementInfo) //Players with low fall distance, Feather Fall or physical immunity (charges used) are ignored // 14.57 can be calculated by resolving damageperc formula below to 0 - if (z_diff >= 14.57f && !isDead() && !isGameMaster() && + if (z_diff >= 14.57f && !isDead() && !IsGameMaster() && !HasAuraType(SPELL_AURA_HOVER) && !HasAuraType(SPELL_AURA_FEATHER_FALL) && !HasAuraType(SPELL_AURA_FLY) && !IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL)) { @@ -25279,7 +25283,7 @@ void Player::HandleFall(MovementInfo const& movementInfo) uint32 final_damage = EnvironmentalDamage(DAMAGE_FALL, damage); // recheck alive, might have died of EnvironmentalDamage, avoid cases when player die in fact like Spirit of Redemption case - if (isAlive() && final_damage < original_health) + if (IsAlive() && final_damage < original_health) UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING, uint32(z_diff*100)); } @@ -25664,10 +25668,10 @@ void Player::ResummonPetTemporaryUnSummonedIfAny() bool Player::IsPetNeedBeTemporaryUnsummoned() const { - return !IsInWorld() || !isAlive() || IsMounted() /*+in flight*/; + return !IsInWorld() || !IsAlive() || IsMounted() /*+in flight*/; } -bool Player::canSeeSpellClickOn(Creature const* c) const +bool Player::CanSeeSpellClickOn(Creature const* c) const { if (!c->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK)) return false; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index bbda2a75fba..38475287e19 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1277,7 +1277,7 @@ class Player : public Unit, public GridObject<Player> // mount_id can be used in scripting calls bool isAcceptWhispers() const { return m_ExtraFlags & PLAYER_EXTRA_ACCEPT_WHISPERS; } void SetAcceptWhispers(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_ACCEPT_WHISPERS; else m_ExtraFlags &= ~PLAYER_EXTRA_ACCEPT_WHISPERS; } - bool isGameMaster() const { return m_ExtraFlags & PLAYER_EXTRA_GM_ON; } + bool IsGameMaster() const { return m_ExtraFlags & PLAYER_EXTRA_GM_ON; } void SetGameMaster(bool on); bool isGMChat() const { return m_ExtraFlags & PLAYER_EXTRA_GM_CHAT; } void SetGMChat(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_GM_CHAT; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_CHAT; } @@ -2150,7 +2150,7 @@ class Player : public Unit, public GridObject<Player> void SetCanBlock(bool value); bool CanTitanGrip() const { return m_canTitanGrip; } void SetCanTitanGrip(bool value) { m_canTitanGrip = value; } - bool CanTameExoticPets() const { return isGameMaster() || HasAuraType(SPELL_AURA_ALLOW_TAME_PET_TYPE); } + bool CanTameExoticPets() const { return IsGameMaster() || HasAuraType(SPELL_AURA_ALLOW_TAME_PET_TYPE); } void SetRegularAttackTime(); void SetBaseModValue(BaseModGroup modGroup, BaseModType modType, float value) { m_auraBaseMod[modGroup][modType] = value; } @@ -2483,7 +2483,7 @@ class Player : public Unit, public GridObject<Player> void SetTitle(CharTitlesEntry const* title, bool lost = false); //bool isActiveObject() const { return true; } - bool canSeeSpellClickOn(Creature const* creature) const; + bool CanSeeSpellClickOn(Creature const* creature) const; uint32 GetChampioningFaction() const { return m_ChampioningFaction; } void SetChampioningFaction(uint32 faction) { m_ChampioningFaction = faction; } diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index 9526d8755a5..3b283ca39c2 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -35,7 +35,7 @@ Totem::Totem(SummonPropertiesEntry const* properties, Unit* owner) : Minion(prop void Totem::Update(uint32 time) { - if (!GetOwner()->isAlive() || !isAlive()) + if (!GetOwner()->IsAlive() || !IsAlive()) { UnSummon(); // remove self return; @@ -136,7 +136,7 @@ void Totem::UnSummon(uint32 msTime) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* target = itr->getSource(); + Player* target = itr->GetSource(); if (target && group->SameSubGroup(owner, target)) target->RemoveAurasDueToSpell(GetSpell(), GetGUID()); } diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 3ed41781982..5361eaff8a2 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -574,13 +574,13 @@ void Transport::UpdateForMap(Map const* targetMap) { for (Map::PlayerList::const_iterator itr = player.begin(); itr != player.end(); ++itr) { - if (this != itr->getSource()->GetTransport()) + if (this != itr->GetSource()->GetTransport()) { UpdateData transData(GetMapId()); - BuildCreateUpdateBlockForPlayer(&transData, itr->getSource()); + BuildCreateUpdateBlockForPlayer(&transData, itr->GetSource()); WorldPacket packet; transData.BuildPacket(&packet); - itr->getSource()->SendDirectMessage(&packet); + itr->GetSource()->SendDirectMessage(&packet); } } } @@ -592,8 +592,8 @@ void Transport::UpdateForMap(Map const* targetMap) transData.BuildPacket(&out_packet); for (Map::PlayerList::const_iterator itr = player.begin(); itr != player.end(); ++itr) - if (this != itr->getSource()->GetTransport()) - itr->getSource()->SendDirectMessage(&out_packet); + if (this != itr->GetSource()->GetTransport()) + itr->GetSource()->SendDirectMessage(&out_packet); } } diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index ac771004096..e319f45f6f2 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -313,7 +313,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) if (ranged) { UpdateDamagePhysical(RANGED_ATTACK); - if (pet && pet->isHunterPet()) // At ranged attack change for hunter pet + if (pet && pet->IsHunterPet()) // At ranged attack change for hunter pet pet->UpdateAttackPowerAndDamage(); } else @@ -1049,7 +1049,7 @@ void Guardian::UpdateResistances(uint32 school) float value = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school)); // hunter and warlock pets gain 40% of owner's resistance - if (isPet()) + if (IsPet()) value += float(CalculatePct(m_owner->GetResistance(SpellSchools(school)), 40)); SetResistance(SpellSchools(school), int32(value)); @@ -1065,9 +1065,9 @@ void Guardian::UpdateArmor() UnitMods unitMod = UNIT_MOD_ARMOR; // hunter pets gain 35% of owner's armor value, warlock pets gain 100% of owner's armor - if (isHunterPet()) + if (IsHunterPet()) bonus_armor = float(CalculatePct(m_owner->GetArmor(), 70)); - else if (isPet()) + else if (IsPet()) bonus_armor = m_owner->GetArmor(); value = GetModifierValue(unitMod, BASE_VALUE); @@ -1145,7 +1145,7 @@ void Guardian::UpdateAttackPowerAndDamage(bool ranged) Unit* owner = GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER) { - if (isHunterPet()) //hunter pets benefit from owner's attack power + if (IsHunterPet()) //hunter pets benefit from owner's attack power { float mod = 1.0f; //Hunter contribution modifier bonusAP = owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.22f * mod; @@ -1165,7 +1165,7 @@ void Guardian::UpdateAttackPowerAndDamage(bool ranged) SetBonusDamage(int32(owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier)); } //demons benefit from warlocks shadow or fire damage - else if (isPet()) + else if (IsPet()) { int32 fire = int32(owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_FIRE)) + owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_FIRE); int32 shadow = int32(owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_SHADOW)) + owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_SHADOW); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bda77af54ed..a6084a62fdb 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -332,7 +332,7 @@ void Unit::Update(uint32 p_time) SendThreatListUpdate(); // update combat timer only for players and pets (only pets with PetAI) - if (isInCombat() && (GetTypeId() == TYPEID_PLAYER || (ToCreature()->isPet() && IsControlledByPlayer()))) + if (IsInCombat() && (GetTypeId() == TYPEID_PLAYER || (ToCreature()->IsPet() && IsControlledByPlayer()))) { // Check UNIT_STATE_MELEE_ATTACKING or UNIT_STATE_CHASE (without UNIT_STATE_FOLLOW in this case) so pets can reach far away // targets without stopping half way there and running off. @@ -358,7 +358,7 @@ void Unit::Update(uint32 p_time) // update abilities available only for fraction of time UpdateReactives(p_time); - if (isAlive()) + if (IsAlive()) { ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, HealthBelowPct(20)); ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, HealthBelowPct(35)); @@ -555,7 +555,7 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons void Unit::DealDamageMods(Unit* victim, uint32 &damage, uint32* absorb) { - if (!victim || !victim->isAlive() || victim->HasUnitState(UNIT_STATE_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) + if (!victim || !victim->IsAlive() || victim->HasUnitState(UNIT_STATE_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) { if (absorb) *absorb += damage; @@ -576,7 +576,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam // Signal to pets that their owner was attacked Pet* pet = victim->ToPlayer()->GetPet(); - if (pet && pet->isAlive()) + if (pet && pet->IsAlive()) pet->AI()->OwnerAttackedBy(this); if (victim->ToPlayer()->GetCommandStatus(CHEAT_GOD)) @@ -584,7 +584,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam } // Signal the pet it was attacked so the AI can respond if needed - if (victim->GetTypeId() == TYPEID_UNIT && this != victim && victim->isPet() && victim->isAlive()) + if (victim->GetTypeId() == TYPEID_UNIT && this != victim && victim->IsPet() && victim->IsAlive()) victim->ToPet()->AI()->AttackedBy(this); if (damagetype != NODAMAGE) @@ -951,7 +951,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama return; Unit* victim = damageInfo->target; - if (!victim || !victim->isAlive()) + if (!victim || !victim->IsAlive()) return; SpellSchoolMask damageSchoolMask = SpellSchoolMask(damageInfo->schoolMask); @@ -1056,7 +1056,7 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage* damageInfo, bool durabilityLoss) if (!victim) return; - if (!victim->isAlive() || victim->HasUnitState(UNIT_STATE_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) + if (!victim->IsAlive() || victim->HasUnitState(UNIT_STATE_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) return; SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(damageInfo->SpellID); @@ -1094,7 +1094,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam if (!victim) return; - if (!isAlive() || !victim->isAlive()) + if (!IsAlive() || !victim->IsAlive()) return; // Select HitInfo/procAttacker/procVictim flag based on attack type @@ -1267,7 +1267,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) { Unit* victim = damageInfo->target; - if (!victim->isAlive() || victim->HasUnitState(UNIT_STATE_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) + if (!victim->IsAlive() || victim->HasUnitState(UNIT_STATE_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) return; // Hmmmm dont like this emotes client must by self do all animations @@ -1488,7 +1488,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* victim, const uint32 damage, SpellInfo void Unit::CalcAbsorbResist(Unit* victim, SpellSchoolMask schoolMask, DamageEffectType damagetype, uint32 const damage, uint32 *absorb, uint32 *resist, SpellInfo const* spellInfo) { - if (!victim || !victim->isAlive() || !damage) + if (!victim || !victim->IsAlive() || !damage) return; DamageInfo dmgInfo = DamageInfo(this, victim, damage, spellInfo, schoolMask, damagetype); @@ -1706,7 +1706,7 @@ void Unit::CalcAbsorbResist(Unit* victim, SpellSchoolMask schoolMask, DamageEffe // Damage can be splitted only if aura has an alive caster Unit* caster = (*itr)->GetCaster(); - if (!caster || (caster == victim) || !caster->IsInWorld() || !caster->isAlive()) + if (!caster || (caster == victim) || !caster->IsInWorld() || !caster->IsAlive()) continue; uint32 splitDamage = CalculatePct(dmgInfo.GetDamage(), (*itr)->GetAmount()); @@ -1799,7 +1799,7 @@ void Unit::AttackerStateUpdate (Unit* victim, WeaponAttackType attType, bool ext if (HasUnitState(UNIT_STATE_CANNOT_AUTOATTACK) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)) return; - if (!victim->isAlive()) + if (!victim->IsAlive()) return; if ((attType == BASE_ATTACK || attType == OFF_ATTACK) && !IsWithinLOSInMap(victim)) @@ -1983,8 +1983,8 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit* victim, WeaponAttackT // Max 40% chance to score a glancing blow against mobs that are higher level (can do only players and pets and not with ranged weapon) if (attType != RANGED_ATTACK && - (GetTypeId() == TYPEID_PLAYER || ToCreature()->isPet()) && - victim->GetTypeId() != TYPEID_PLAYER && !victim->ToCreature()->isPet() && + (GetTypeId() == TYPEID_PLAYER || ToCreature()->IsPet()) && + victim->GetTypeId() != TYPEID_PLAYER && !victim->ToCreature()->IsPet() && getLevel() < victim->getLevelForTarget(this)) { // cap possible value (with bonuses > max skill) @@ -2336,14 +2336,14 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit* victim, SpellInfo const* spell) SpellMissInfo Unit::MagicSpellHitResult(Unit* victim, SpellInfo const* spell) { // Can`t miss on dead target (on skinning for example) - if (!victim->isAlive() && victim->GetTypeId() != TYPEID_PLAYER) + if (!victim->IsAlive() && victim->GetTypeId() != TYPEID_PLAYER) return SPELL_MISS_NONE; SpellSchoolMask schoolMask = spell->GetSchoolMask(); // PvP - PvE spell misschances per leveldif > 2 int32 lchance = victim->GetTypeId() == TYPEID_PLAYER ? 7 : 11; int32 thisLevel = getLevelForTarget(victim); - if (GetTypeId() == TYPEID_UNIT && ToCreature()->isTrigger()) + if (GetTypeId() == TYPEID_UNIT && ToCreature()->IsTrigger()) thisLevel = std::max<int32>(thisLevel, spell->SpellLevel); int32 leveldif = int32(victim->getLevelForTarget(this)) - thisLevel; @@ -2479,7 +2479,7 @@ float Unit::GetUnitDodgeChance() const return GetFloatValue(PLAYER_DODGE_PERCENTAGE); else { - if (ToCreature()->isTotem()) + if (ToCreature()->IsTotem()) return 0.0f; else { @@ -2551,7 +2551,7 @@ float Unit::GetUnitBlockChance() const } else { - if (ToCreature()->isTotem()) + if (ToCreature()->IsTotem()) return 0.0f; else { @@ -2897,9 +2897,9 @@ bool Unit::isInBackInMap(Unit const* target, float distance, float arc) const bool Unit::isInAccessiblePlaceFor(Creature const* c) const { if (IsInWater()) - return c->canSwim(); + return c->CanSwim(); else - return c->canWalk() || c->CanFly(); + return c->CanWalk() || c->CanFly(); } bool Unit::IsInWater() const @@ -2914,7 +2914,7 @@ bool Unit::IsUnderWater() const void Unit::UpdateUnderwaterState(Map* m, float x, float y, float z) { - if (!isPet() && !IsVehicle()) + if (!IsPet() && !IsVehicle()) return; LiquidData liquid_status; @@ -3067,7 +3067,7 @@ AuraApplication * Unit::_CreateAuraApplication(Aura* aura, uint8 effMask) uint32 aurId = aurSpellInfo->Id; // ghost spell check, allow apply any auras at player loading in ghost mode (will be cleanup after load) - if (!isAlive() && !aurSpellInfo->IsDeathPersistent() && + if (!IsAlive() && !aurSpellInfo->IsDeathPersistent() && (GetTypeId() != TYPEID_PLAYER || !ToPlayer()->GetSession()->PlayerLoading())) return NULL; @@ -3200,7 +3200,7 @@ void Unit::_UnapplyAura(AuraApplicationMap::iterator &i, AuraRemoveMode removeMo ASSERT(!aurApp->GetEffectMask()); // Remove totem at next update if totem loses its aura - if (aurApp->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE && GetTypeId() == TYPEID_UNIT && ToCreature()->isTotem()&& ToTotem()->GetSummonerGUID() == aura->GetCasterGUID()) + if (aurApp->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE && GetTypeId() == TYPEID_UNIT && ToCreature()->IsTotem()&& ToTotem()->GetSummonerGUID() == aura->GetCasterGUID()) { if (ToTotem()->GetSpell() == aura->GetId() && ToTotem()->GetTotemType() == TOTEM_PASSIVE) ToTotem()->setDeathState(JUST_DIED); @@ -4685,7 +4685,7 @@ void Unit::ProcDamageAndSpell(Unit* victim, uint32 procAttacker, uint32 procVict ProcDamageAndSpellFor(false, victim, procAttacker, procExtra, attType, procSpell, amount, procAura); // Now go on with a victim's events'n'auras // Not much to do if no flags are set or there is no victim - if (victim && victim->isAlive() && procVictim) + if (victim && victim->IsAlive() && procVictim) victim->ProcDamageAndSpellFor(true, this, procVictim, procExtra, attType, procSpell, amount, procAura); } @@ -5051,7 +5051,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // 41409 Dementia: Every 5 seconds either gives you -5% damage/healing. (Druid, Shaman, Priest, Warlock, Mage, Paladin) case 39446: { - if (GetTypeId() != TYPEID_PLAYER || !isAlive()) + if (GetTypeId() != TYPEID_PLAYER || !IsAlive()) return false; // Select class defined buff @@ -5114,7 +5114,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // triggered at positive/self casts also, current attack target used then if (target && IsFriendlyTo(target)) { - target = getVictim(); + target = GetVictim(); if (!target) { uint64 selected_guid = ToPlayer()->GetSelection(); @@ -5237,7 +5237,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere case 31872: { // Roll chane - if (!victim || !victim->isAlive() || !roll_chance_i(triggerAmount)) + if (!victim || !victim->IsAlive() || !roll_chance_i(triggerAmount)) return false; // Remove any stun effect on target @@ -5546,7 +5546,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Glyph of Sunder Armor if (dummySpell->Id == 58387) { - if (!victim || !victim->isAlive() || !procSpell) + if (!victim || !victim->IsAlive() || !procSpell) return false; target = SelectNearbyTarget(victim); @@ -5678,7 +5678,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Vampiric Touch if (dummySpell->SpellFamilyFlags[1] & 0x00000400) { - if (!victim || !victim->isAlive()) + if (!victim || !victim->IsAlive()) return false; if (effIndex != 0) @@ -5707,7 +5707,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Vampiric Embrace case 15286: { - if (!victim || !victim->isAlive() || procSpell->SpellFamilyFlags[1] & 0x80000) + if (!victim || !victim->IsAlive() || procSpell->SpellFamilyFlags[1] & 0x80000) return false; // heal amount @@ -6055,7 +6055,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) { // check if it was heal by paladin which casted this beacon of light if (member->GetAura(53563, victim->GetGUID())) @@ -6226,7 +6226,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere case 71406: // Tiny Abomination in a Jar case 71545: // Tiny Abomination in a Jar (Heroic) { - if (!victim || !victim->isAlive()) + if (!victim || !victim->IsAlive()) return false; CastSpell(this, 71432, true, NULL, triggeredByAura); @@ -6337,7 +6337,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere case 33757: { Player* player = ToPlayer(); - if (!player || !castItem || !castItem->IsEquipped() || !victim || !victim->isAlive()) + if (!player || !castItem || !castItem->IsEquipped() || !victim || !victim->IsAlive()) return false; // custom cooldown processing case @@ -6562,7 +6562,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Flametongue Weapon (Passive) if (dummySpell->SpellFamilyFlags[0] & 0x200000) { - if (GetTypeId() != TYPEID_PLAYER || !victim || !victim->isAlive() || !castItem || !castItem->IsEquipped()) + if (GetTypeId() != TYPEID_PLAYER || !victim || !victim->IsAlive() || !castItem || !castItem->IsEquipped()) return false; WeaponAttackType attType = WeaponAttackType(Player::GetAttackBySlot(castItem->GetSlot())); @@ -6630,7 +6630,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Blood-Caked Blade if (dummySpell->SpellIconID == 138) { - if (!target || !target->isAlive()) + if (!target || !target->IsAlive()) return false; triggered_spell_id = dummySpell->Effects[effIndex].TriggerSpell; @@ -6659,11 +6659,11 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere break; } - if (pPet && pPet->getVictim() && damage && procSpell) + if (pPet && pPet->GetVictim() && damage && procSpell) { uint32 procDmg = damage / 2; - pPet->SendSpellNonMeleeDamageLog(pPet->getVictim(), procSpell->Id, procDmg, procSpell->GetSchoolMask(), 0, 0, false, 0, false); - pPet->DealDamage(pPet->getVictim(), procDmg, NULL, SPELL_DIRECT_DAMAGE, procSpell->GetSchoolMask(), procSpell, true); + pPet->SendSpellNonMeleeDamageLog(pPet->GetVictim(), procSpell->Id, procDmg, procSpell->GetSchoolMask(), 0, 0, false, 0, false); + pPet->DealDamage(pPet->GetVictim(), procDmg, NULL, SPELL_DIRECT_DAMAGE, procSpell->GetSchoolMask(), procSpell, true); break; } else @@ -7124,9 +7124,9 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 40336: { // On successful melee or ranged attack gain $29471s1 mana and if possible drain $27526s1 mana from the target. - if (isAlive()) + if (IsAlive()) CastSpell(this, 29471, true, castItem, triggeredByAura); - if (victim && victim->isAlive()) + if (victim && victim->IsAlive()) CastSpell(victim, 27526, true, castItem, triggeredByAura); return true; } @@ -7284,7 +7284,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 67712: // Item - Coliseum 25 Normal Caster Trinket case 67758: // Item - Coliseum 25 Heroic Caster Trinket { - if (!victim || !victim->isAlive() || GetTypeId() != TYPEID_PLAYER) + if (!victim || !victim->IsAlive() || GetTypeId() != TYPEID_PLAYER) return false; uint32 stack_spell_id = 0; @@ -7359,7 +7359,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg basepoints0 = int32(CountPctFromMaxHealth(triggerAmount)); target = this; trigger_spell_id = 31616; - if (victim && victim->isAlive()) + if (victim && victim->IsAlive()) victim->getThreatManager().modifyThreatPercent(this, -10); } else @@ -7487,7 +7487,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg // Greater Heal Refund (Avatar Raiment set) case 37594: { - if (!victim || !victim->isAlive()) + if (!victim || !victim->IsAlive()) return false; // Doesn't proc if target already has full health @@ -7502,7 +7502,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 40971: { // If your target is below $s1% health - if (!victim || !victim->isAlive() || victim->HealthAbovePct(triggerAmount)) + if (!victim || !victim->IsAlive() || victim->HealthAbovePct(triggerAmount)) return false; break; } @@ -7687,7 +7687,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au { int32 scriptId = triggeredByAura->GetMiscValue(); - if (!victim || !victim->isAlive()) + if (!victim || !victim->IsAlive()) return false; Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER @@ -7782,7 +7782,7 @@ void Unit::setPowerType(Powers new_powertype) } } -FactionTemplateEntry const* Unit::getFactionTemplateEntry() const +FactionTemplateEntry const* Unit::GetFactionTemplateEntry() const { FactionTemplateEntry const* entry = sFactionTemplateStore.LookupEntry(getFaction()); if (!entry) @@ -7836,7 +7836,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const if (selfPlayerOwner->IsInRaidWith(targetPlayerOwner)) return REP_FRIENDLY; // return true to allow config option AllowTwoSide.Interaction.Group to work // however client seems to allow mixed group parties, because in 13850 client it works like: - // return GetFactionReactionTo(getFactionTemplateEntry(), target); + // return GetFactionReactionTo(GetFactionTemplateEntry(), target); } // check FFA_PVP @@ -7846,7 +7846,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const if (selfPlayerOwner) { - if (FactionTemplateEntry const* targetFactionTemplateEntry = target->getFactionTemplateEntry()) + if (FactionTemplateEntry const* targetFactionTemplateEntry = target->GetFactionTemplateEntry()) { if (ReputationRank const* repRank = selfPlayerOwner->GetReputationMgr().GetForcedRankIfAny(targetFactionTemplateEntry)) return *repRank; @@ -7873,7 +7873,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const } } // do checks dependant only on our faction - return GetFactionReactionTo(getFactionTemplateEntry(), target); + return GetFactionReactionTo(GetFactionTemplateEntry(), target); } ReputationRank Unit::GetFactionReactionTo(FactionTemplateEntry const* factionTemplateEntry, Unit const* target) @@ -7882,7 +7882,7 @@ ReputationRank Unit::GetFactionReactionTo(FactionTemplateEntry const* factionTem if (!factionTemplateEntry) return REP_NEUTRAL; - FactionTemplateEntry const* targetFactionTemplateEntry = target->getFactionTemplateEntry(); + FactionTemplateEntry const* targetFactionTemplateEntry = target->GetFactionTemplateEntry(); if (!targetFactionTemplateEntry) return REP_NEUTRAL; @@ -7935,7 +7935,7 @@ bool Unit::IsFriendlyTo(Unit const* unit) const bool Unit::IsHostileToPlayers() const { - FactionTemplateEntry const* my_faction = getFactionTemplateEntry(); + FactionTemplateEntry const* my_faction = GetFactionTemplateEntry(); if (!my_faction || !my_faction->faction) return false; @@ -7948,7 +7948,7 @@ bool Unit::IsHostileToPlayers() const bool Unit::IsNeutralToAll() const { - FactionTemplateEntry const* my_faction = getFactionTemplateEntry(); + FactionTemplateEntry const* my_faction = GetFactionTemplateEntry(); if (!my_faction || !my_faction->faction) return true; @@ -7971,8 +7971,8 @@ void Unit::_removeAttacker(Unit* pAttacker) Unit* Unit::getAttackerForHelper() const // If someone wants to help, who to give them { - if (getVictim() != NULL) - return getVictim(); + if (GetVictim() != NULL) + return GetVictim(); if (!m_attackers.empty()) return *(m_attackers.begin()); @@ -7986,7 +7986,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) return false; // dead units can neither attack nor be attacked - if (!isAlive() || !victim->IsInWorld() || !victim->isAlive()) + if (!IsAlive() || !victim->IsInWorld() || !victim->IsAlive()) return false; // player cannot attack in mount state @@ -7996,7 +7996,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) // nobody can attack GM in GM-mode if (victim->GetTypeId() == TYPEID_PLAYER) { - if (victim->ToPlayer()->isGameMaster()) + if (victim->ToPlayer()->IsGameMaster()) return false; } else @@ -8054,7 +8054,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) //if (GetTypeId() == TYPEID_UNIT) // ToCreature()->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ()); - if (GetTypeId() == TYPEID_UNIT && !ToCreature()->isPet()) + if (GetTypeId() == TYPEID_UNIT && !ToCreature()->IsPet()) { // should not let player enter combat by right clicking target - doesn't helps SetInCombatWith(victim); @@ -8079,7 +8079,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) { Pet* playerPet = this->ToPlayer()->GetPet(); - if (playerPet && playerPet->isAlive()) + if (playerPet && playerPet->IsAlive()) playerPet->AI()->OwnerAttacked(victim); } @@ -8410,10 +8410,10 @@ void Unit::SetMinion(Minion *minion, bool apply) { if (Guardian* oldPet = GetGuardianPet()) { - if (oldPet != minion && (oldPet->isPet() || minion->isPet() || oldPet->GetEntry() != minion->GetEntry())) + if (oldPet != minion && (oldPet->IsPet() || minion->IsPet() || oldPet->GetEntry() != minion->GetEntry())) { // remove existing minion pet - if (oldPet->isPet()) + if (oldPet->IsPet()) ((Pet*)oldPet)->Remove(PET_SAVE_AS_CURRENT); else oldPet->UnSummon(); @@ -8444,7 +8444,7 @@ void Unit::SetMinion(Minion *minion, bool apply) minion->SetByteValue(UNIT_FIELD_BYTES_2, 1, GetByteValue(UNIT_FIELD_BYTES_2, 1)); // FIXME: hack, speed must be set only at follow - if (GetTypeId() == TYPEID_PLAYER && minion->isPet()) + if (GetTypeId() == TYPEID_PLAYER && minion->IsPet()) for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) minion->SetSpeed(UnitMoveType(i), m_speed_rate[i], true); @@ -8482,7 +8482,7 @@ void Unit::SetMinion(Minion *minion, bool apply) if (GetPetGUID() == minion->GetGUID()) SetPetGUID(0); } - else if (minion->isTotem()) + else if (minion->IsTotem()) { // All summoned by totem minions must disappear when it is removed. if (SpellInfo const* spInfo = sSpellMgr->GetSpellInfo(minion->ToTotem()->GetSpell())) @@ -8532,7 +8532,7 @@ void Unit::SetMinion(Minion *minion, bool apply) // show another pet bar if there is no charm bar if (GetTypeId() == TYPEID_PLAYER && !GetCharmGUID()) { - if ((*itr)->isPet()) + if ((*itr)->IsPet()) ToPlayer()->PetSpellInitialize(); else ToPlayer()->CharmSpellInitialize(); @@ -8552,7 +8552,7 @@ void Unit::GetAllMinionsByEntry(std::list<Creature*>& Minions, uint32 entry) Unit* unit = *itr; ++itr; if (unit->GetEntry() == entry && unit->GetTypeId() == TYPEID_UNIT - && unit->ToCreature()->isSummon()) // minion, actually + && unit->ToCreature()->IsSummon()) // minion, actually Minions.push_back(unit->ToCreature()); } } @@ -8564,7 +8564,7 @@ void Unit::RemoveAllMinionsByEntry(uint32 entry) Unit* unit = *itr; ++itr; if (unit->GetEntry() == entry && unit->GetTypeId() == TYPEID_UNIT - && unit->ToCreature()->isSummon()) // minion, actually + && unit->ToCreature()->IsSummon()) // minion, actually unit->ToTempSummon()->UnSummon(); // i think this is safe because i have never heard that a despawned minion will trigger a same minion } @@ -8661,7 +8661,7 @@ int32 Unit::DealHeal(Unit* victim, uint32 addhealth) Unit* unit = this; - if (GetTypeId() == TYPEID_UNIT && ToCreature()->isTotem()) + if (GetTypeId() == TYPEID_UNIT && ToCreature()->IsTotem()) unit = GetOwner(); if (Player* player = unit->ToPlayer()) @@ -8748,7 +8748,7 @@ void Unit::RemoveAllControlled() m_Controlled.erase(m_Controlled.begin()); if (target->GetCharmerGUID() == GetGUID()) target->RemoveCharmAuras(); - else if (target->GetOwnerGUID() == GetGUID() && target->isSummon()) + else if (target->GetOwnerGUID() == GetGUID() && target->IsSummon()) target->ToTempSummon()->UnSummon(); else TC_LOG_ERROR(LOG_FILTER_UNITS, "Unit %u is trying to release unit %u which is neither charmed nor owned by it", GetEntry(), target->GetEntry()); @@ -8785,7 +8785,7 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) if (GetTypeId() == TYPEID_PLAYER) player = ToPlayer(); // Should we enable this also for charmed units? - else if (GetTypeId() == TYPEID_UNIT && ToCreature()->isPet()) + else if (GetTypeId() == TYPEID_UNIT && ToCreature()->IsPet()) player = GetOwner()->ToPlayer(); if (!player) @@ -8810,15 +8810,15 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) nearMembers.reserve(group->GetMembersCount() * 2); for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* Target = itr->getSource()) + if (Player* Target = itr->GetSource()) { // IsHostileTo check duel and controlled by enemy - if (Target != this && Target->isAlive() && IsWithinDistInMap(Target, radius) && !IsHostileTo(Target)) + if (Target != this && Target->IsAlive() && IsWithinDistInMap(Target, radius) && !IsHostileTo(Target)) nearMembers.push_back(Target); // Push player's pet to vector if (Unit* pet = Target->GetGuardianPet()) - if (pet != this && pet->isAlive() && IsWithinDistInMap(pet, radius) && !IsHostileTo(pet)) + if (pet != this && pet->IsAlive() && IsWithinDistInMap(pet, radius) && !IsHostileTo(pet)) nearMembers.push_back(pet); } @@ -8873,7 +8873,7 @@ void Unit::UnsummonAllTotems() continue; if (Creature* OldTotem = GetMap()->GetCreature(m_SummonSlot[i])) - if (OldTotem->isSummon()) + if (OldTotem->IsSummon()) OldTotem->ToTempSummon()->UnSummon(); } } @@ -8940,7 +8940,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin return pdamage; // For totems get damage bonus from owner - if (GetTypeId() == TYPEID_UNIT && ToCreature()->isTotem()) + if (GetTypeId() == TYPEID_UNIT && ToCreature()->IsTotem()) if (Unit* owner = GetOwner()) return owner->SpellDamageBonusDone(victim, spellProto, pdamage, damagetype); @@ -8950,7 +8950,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin int32 DoneTotal = 0; // Pet damage? - if (GetTypeId() == TYPEID_UNIT && !ToCreature()->isPet()) + if (GetTypeId() == TYPEID_UNIT && !ToCreature()->IsPet()) DoneTotalMod *= ToCreature()->GetSpellDamageMod(ToCreature()->GetCreatureTemplate()->rank); // Some spells don't benefit from pct done mods @@ -9124,7 +9124,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin if (HasAura(100001)) DoneTotalMod *= 2; // Shadow Bite (30% increase from each dot) - if (spellProto->SpellFamilyFlags[1] & 0x00400000 && isPet()) + if (spellProto->SpellFamilyFlags[1] & 0x00400000 && IsPet()) if (uint8 count = victim->GetDoTsByCaster(GetOwnerGUID())) AddPct(DoneTotalMod, 30 * count); break; @@ -9354,7 +9354,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas { //! Mobs can't crit with spells. Player Totems can //! Fire Elemental (from totem) can too - but this part is a hack and needs more research - if (IS_CREATURE_GUID(GetGUID()) && !(isTotem() && IS_PLAYER_GUID(GetOwnerGUID())) && GetEntry() != 15438) + if (IS_CREATURE_GUID(GetGUID()) && !(IsTotem() && IS_PLAYER_GUID(GetOwnerGUID())) && GetEntry() != 15438) return false; // not critting spell @@ -9602,7 +9602,7 @@ uint32 Unit::SpellCriticalHealingBonus(SpellInfo const* /*spellProto*/, uint32 d uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, uint32 healamount, DamageEffectType damagetype, uint32 stack) const { // For totems get healing bonus from owner (statue isn't totem in fact) - if (GetTypeId() == TYPEID_UNIT && isTotem()) + if (GetTypeId() == TYPEID_UNIT && IsTotem()) if (Unit* owner = GetOwner()) return owner->SpellHealingBonusDone(victim, spellProto, healamount, damagetype, stack); @@ -10473,7 +10473,7 @@ MountCapabilityEntry const* Unit::GetMountCapability(uint32 mountType) const return NULL; } -bool Unit::isServiceProvider() const +bool Unit::IsServiceProvider() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR | UNIT_NPC_FLAG_TRAINER | UNIT_NPC_FLAG_FLIGHTMASTER | @@ -10511,10 +10511,10 @@ void Unit::CombatStart(Unit* target, bool initialAggro) if (!target->IsStandState()) target->SetStandState(UNIT_STAND_STATE_STAND); - if (!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER + if (!target->IsInCombat() && target->GetTypeId() != TYPEID_PLAYER && !target->ToCreature()->HasReactState(REACT_PASSIVE) && target->ToCreature()->IsAIEnabled) { - if (target->isPet()) + if (target->IsPet()) target->ToCreature()->AI()->AttackedBy(this); // PetAI has special handler before AttackStart() else target->ToCreature()->AI()->AttackStart(this); @@ -10540,13 +10540,13 @@ void Unit::CombatStart(Unit* target, bool initialAggro) void Unit::SetInCombatState(bool PvP, Unit* enemy) { // only alive units can be in combat - if (!isAlive()) + if (!IsAlive()) return; if (PvP) m_CombatTimer = 5000; - if (isInCombat() || HasUnitState(UNIT_STATE_EVADE)) + if (IsInCombat() || HasUnitState(UNIT_STATE_EVADE)) return; SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); @@ -10570,7 +10570,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) creature->GetFormation()->MemberAttackStart(creature, enemy); } - if (isPet()) + if (IsPet()) { UpdateSpeed(MOVE_RUN, true); UpdateSpeed(MOVE_SWIM, true); @@ -10603,14 +10603,14 @@ void Unit::ClearInCombat() if (HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED)) SetUInt32Value(UNIT_DYNAMIC_FLAGS, creature->GetCreatureTemplate()->dynamicflags); - if (creature->isPet()) + if (creature->IsPet()) { if (Unit* owner = GetOwner()) for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) if (owner->GetSpeedRate(UnitMoveType(i)) > GetSpeedRate(UnitMoveType(i))) SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true); } - else if (!isCharmed()) + else if (!IsCharmed()) return; } else @@ -10621,14 +10621,14 @@ void Unit::ClearInCombat() bool Unit::isTargetableForAttack(bool checkFakeDeath) const { - if (!isAlive()) + if (!IsAlive()) return false; if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC)) return false; - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->isGameMaster()) + if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->IsGameMaster()) return false; return !HasUnitState(UNIT_STATE_UNATTACKABLE) && (!checkFakeDeath || !HasUnitState(UNIT_STATE_DIED)); @@ -10650,7 +10650,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo // can't attack unattackable units or GMs if (target->HasUnitState(UNIT_STATE_UNATTACKABLE) - || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster())) + || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->IsGameMaster())) return false; // can't attack own vehicle or passenger @@ -10659,11 +10659,11 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo return false; // can't attack invisible (ignore stealth for aoe spells) also if the area being looked at is from a spell use the dynamic object created instead of the casting unit. - if ((!bySpell || !(bySpell->AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE)) && (obj ? !obj->canSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()) : !canSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()))) + if ((!bySpell || !(bySpell->AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE)) && (obj ? !obj->CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()) : !CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()))) return false; // can't attack dead - if ((!bySpell || !bySpell->IsAllowingDeadTarget()) && !target->isAlive()) + if ((!bySpell || !bySpell->IsAllowingDeadTarget()) && !target->IsAlive()) return false; // can't attack untargetable @@ -10709,7 +10709,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo Player const* player = target->GetTypeId() == TYPEID_PLAYER ? target->ToPlayer() : ToPlayer(); Unit const* creature = target->GetTypeId() == TYPEID_UNIT ? target : this; - if (FactionTemplateEntry const* factionTemplate = creature->getFactionTemplateEntry()) + if (FactionTemplateEntry const* factionTemplate = creature->GetFactionTemplateEntry()) { if (!(player->GetReputationMgr().GetForcedRankIfAny(factionTemplate))) if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionTemplate->faction)) @@ -10771,7 +10771,7 @@ bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) co // can't assist unattackable units or GMs if (target->HasUnitState(UNIT_STATE_UNATTACKABLE) - || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster())) + || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->IsGameMaster())) return false; // can't assist own vehicle or passenger @@ -10780,11 +10780,11 @@ bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) co return false; // can't assist invisible - if ((!bySpell || !(bySpell->AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE)) && !canSeeOrDetect(target, bySpell && bySpell->IsAffectingArea())) + if ((!bySpell || !(bySpell->AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE)) && !CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea())) return false; // can't assist dead - if ((!bySpell || !bySpell->IsAllowingDeadTarget()) && !target->isAlive()) + if ((!bySpell || !bySpell->IsAllowingDeadTarget()) && !target->IsAlive()) return false; // can't assist untargetable @@ -10856,7 +10856,7 @@ int32 Unit::ModifyHealth(int32 dVal) return 0; // Part of Evade mechanics. Only track health lost, not gained. - if (dVal < 0 && GetTypeId() != TYPEID_PLAYER && !isPet()) + if (dVal < 0 && GetTypeId() != TYPEID_PLAYER && !IsPet()) SetLastDamagedTime(time(NULL)); int32 curHealth = (int32)GetHealth(); @@ -11088,7 +11088,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) if (GetTypeId() == TYPEID_UNIT) { Unit* pOwner = GetCharmerOrOwner(); - if ((isPet() || isGuardian()) && !isInCombat() && pOwner) // Must check for owner or crash on "Tame Beast" + if ((IsPet() || IsGuardian()) && !IsInCombat() && pOwner) // Must check for owner or crash on "Tame Beast" { // For every yard over 5, increase speed by 0.01 // to help prevent pet from lagging behind and despawning @@ -11180,7 +11180,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) // and do it only for real sent packets and use run for run/mounted as client expected ++ToPlayer()->m_forced_speed_changes[mtype]; - if (!isInCombat()) + if (!IsInCombat()) if (Pet* pet = ToPlayer()->GetPet()) pet->SetSpeed(mtype, m_speed_rate[mtype], forced); } @@ -11258,11 +11258,11 @@ bool Unit::CanHaveThreatList() const return false; // only alive units can have threat list - if (!isAlive() || isDying()) + if (!IsAlive() || isDying()) return false; // totems can not have threat list - if (ToCreature()->isTotem()) + if (ToCreature()->IsTotem()) return false; // vehicles can not have threat list @@ -11312,7 +11312,7 @@ void Unit::TauntApply(Unit* taunter) { ASSERT(GetTypeId() == TYPEID_UNIT); - if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && taunter->ToPlayer()->isGameMaster())) + if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && taunter->ToPlayer()->IsGameMaster())) return; if (!CanHaveThreatList()) @@ -11323,7 +11323,7 @@ void Unit::TauntApply(Unit* taunter) if (creature->HasReactState(REACT_PASSIVE)) return; - Unit* target = getVictim(); + Unit* target = GetVictim(); if (target && target == taunter) return; @@ -11340,7 +11340,7 @@ void Unit::TauntFadeOut(Unit* taunter) { ASSERT(GetTypeId() == TYPEID_UNIT); - if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && taunter->ToPlayer()->isGameMaster())) + if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && taunter->ToPlayer()->IsGameMaster())) return; if (!CanHaveThreatList()) @@ -11351,7 +11351,7 @@ void Unit::TauntFadeOut(Unit* taunter) if (creature->HasReactState(REACT_PASSIVE)) return; - Unit* target = getVictim(); + Unit* target = GetVictim(); if (!target || target != taunter) return; @@ -11388,8 +11388,8 @@ Unit* Creature::SelectVictim() Unit* caster = tauntAuras.back()->GetCaster(); // The last taunt aura caster is alive an we are happy to attack him - if (caster && caster->isAlive()) - return getVictim(); + if (caster && caster->IsAlive()) + return GetVictim(); else if (tauntAuras.size() > 1) { // We do not have last taunt aura caster but we have more taunt auras, @@ -11401,7 +11401,7 @@ Unit* Creature::SelectVictim() { --aura; caster = (*aura)->GetCaster(); - if (caster && canSeeOrDetect(caster, true) && IsValidAttackTarget(caster) && caster->isInAccessiblePlaceFor(ToCreature())) + if (caster && CanSeeOrDetect(caster, true) && IsValidAttackTarget(caster) && caster->isInAccessiblePlaceFor(ToCreature())) { target = caster; break; @@ -11409,7 +11409,7 @@ Unit* Creature::SelectVictim() } while (aura != tauntAuras.begin()); } else - target = getVictim(); + target = GetVictim(); } if (CanHaveThreatList()) @@ -11422,17 +11422,17 @@ Unit* Creature::SelectVictim() { // We have player pet probably target = getAttackerForHelper(); - if (!target && isSummon()) + if (!target && IsSummon()) { if (Unit* owner = ToTempSummon()->GetOwner()) { - if (owner->isInCombat()) + if (owner->IsInCombat()) target = owner->getAttackerForHelper(); if (!target) { for (ControlList::const_iterator itr = owner->m_Controlled.begin(); itr != owner->m_Controlled.end(); ++itr) { - if ((*itr)->isInCombat()) + if ((*itr)->IsInCombat()) { target = (*itr)->getAttackerForHelper(); if (target) @@ -11446,7 +11446,7 @@ Unit* Creature::SelectVictim() else return NULL; - if (target && _IsTargetAcceptable(target) && canCreatureAttack(target)) + if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target)) { SetInFront(target); return target; @@ -11466,7 +11466,7 @@ Unit* Creature::SelectVictim() // Note: creature does not have targeted movement generator but has attacker in this case for (AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr) { - if ((*itr) && !canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER + if ((*itr) && !CanCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER && !(*itr)->ToCreature()->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) return NULL; } @@ -11480,7 +11480,7 @@ Unit* Creature::SelectVictim() { target = SelectNearestTargetInAttackDistance(m_CombatDistance ? m_CombatDistance : ATTACK_DISTANCE); - if (target && _IsTargetAcceptable(target) && canCreatureAttack(target)) + if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target)) return target; } @@ -11702,13 +11702,13 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, return 1.0f; // test pet/charm masters instead pets/charmeds - Unit const* targetOwner = GetCharmerOrOwner(); + Unit const* tarGetOwner = GetCharmerOrOwner(); Unit const* casterOwner = caster->GetCharmerOrOwner(); // Duration of crowd control abilities on pvp target is limited by 10 sec. (2.2.0) if (limitduration > 0 && duration > limitduration) { - Unit const* target = targetOwner ? targetOwner : this; + Unit const* target = tarGetOwner ? tarGetOwner : this; Unit const* source = casterOwner ? casterOwner : caster; if ((target->GetTypeId() == TYPEID_PLAYER @@ -11737,7 +11737,7 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, } // Some diminishings applies to mobs too (for example, Stun) else if ((GetDiminishingReturnsGroupType(group) == DRTYPE_PLAYER - && ((targetOwner ? (targetOwner->GetTypeId() == TYPEID_PLAYER) : (GetTypeId() == TYPEID_PLAYER)) + && ((tarGetOwner ? (tarGetOwner->GetTypeId() == TYPEID_PLAYER) : (GetTypeId() == TYPEID_PLAYER)) || (GetTypeId() == TYPEID_UNIT && ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH))) || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL) { @@ -12235,7 +12235,7 @@ int32 Unit::GetCreatePowers(Powers power) const case POWER_FOCUS: if (GetTypeId() == TYPEID_PLAYER && getClass() == CLASS_HUNTER) return 100; - return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->isPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 100); + return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 100); case POWER_ENERGY: return 100; case POWER_RUNIC_POWER: @@ -12351,7 +12351,7 @@ void Unit::UpdateCharmAI() if (i_disabledAI) // disabled AI must be primary AI { - if (!isCharmed()) + if (!IsCharmed()) { delete i_AI; i_AI = i_disabledAI; @@ -12360,7 +12360,7 @@ void Unit::UpdateCharmAI() } else { - if (isCharmed()) + if (IsCharmed()) { i_disabledAI = i_AI; if (isPossessed() || IsVehicle()) @@ -13196,7 +13196,7 @@ Player* Unit::GetSpellModOwner() const { if (GetTypeId() == TYPEID_PLAYER) return (Player*)this; - if (ToCreature()->isPet() || ToCreature()->isTotem()) + if (ToCreature()->IsPet() || ToCreature()->IsTotem()) { Unit* owner = GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER) @@ -13426,8 +13426,8 @@ Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const VisitNearbyObject(dist, searcher); // remove current target - if (getVictim()) - targets.remove(getVictim()); + if (GetVictim()) + targets.remove(GetVictim()); if (exclude) targets.remove(exclude); @@ -13435,7 +13435,7 @@ Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const // remove not LoS targets for (std::list<Unit*>::iterator tIter = targets.begin(); tIter != targets.end();) { - if (!IsWithinLOSInMap(*tIter) || (*tIter)->isTotem() || (*tIter)->isSpiritService() || (*tIter)->GetCreatureType() == CREATURE_TYPE_CRITTER) + if (!IsWithinLOSInMap(*tIter) || (*tIter)->IsTotem() || (*tIter)->IsSpiritService() || (*tIter)->GetCreatureType() == CREATURE_TYPE_CRITTER) targets.erase(tIter++); else ++tIter; @@ -13498,7 +13498,7 @@ void Unit::ApplyCastTimePercentMod(float val, bool apply) uint32 Unit::GetCastingTimeForBonus(SpellInfo const* spellProto, DamageEffectType damagetype, uint32 CastingTime) const { // Not apply this to creature casted spells with casttime == 0 - if (CastingTime == 0 && GetTypeId() == TYPEID_UNIT && !ToCreature()->isPet()) + if (CastingTime == 0 && GetTypeId() == TYPEID_UNIT && !ToCreature()->IsPet()) return 3500; if (CastingTime > 7000) CastingTime = 7000; @@ -13598,7 +13598,7 @@ void Unit::UpdateAuraForGroup(uint8 slot) player->SetAuraUpdateMaskForRaid(slot); } } - else if (GetTypeId() == TYPEID_UNIT && ToCreature()->isPet()) + else if (GetTypeId() == TYPEID_UNIT && ToCreature()->IsPet()) { Pet* pet = ((Pet*)this); if (pet->isControlled()) @@ -14077,7 +14077,7 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) } // Do KILL and KILLED procs. KILL proc is called only for the unit who landed the killing blow (and its owner - for pets and totems) regardless of who tapped the victim - if (isPet() || isTotem()) + if (IsPet() || IsTotem()) if (Unit* owner = GetOwner()) owner->ProcDamageAndSpell(victim, PROC_FLAG_KILL, PROC_FLAG_NONE, PROC_EX_NONE, 0); @@ -14131,7 +14131,7 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) if (player) { Pet* pet = player->GetPet(); - if (pet && pet->isAlive() && pet->isControlled()) + if (pet && pet->IsAlive() && pet->isControlled()) pet->AI()->KilledUnit(victim); } @@ -14170,7 +14170,7 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) { TC_LOG_DEBUG(LOG_FILTER_UNITS, "DealDamageNotPlayer"); - if (!creature->isPet()) + if (!creature->IsPet()) { creature->DeleteThreatList(); CreatureTemplate const* cInfo = creature->GetCreatureTemplate(); @@ -14450,8 +14450,8 @@ void Unit::SetStunned(bool apply) } else { - if (isAlive() && getVictim()) - SetTarget(getVictim()->GetGUID()); + if (IsAlive() && GetVictim()) + SetTarget(GetVictim()->GetGUID()); // don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface) Unit* owner = GetOwner(); @@ -14554,12 +14554,12 @@ void Unit::SetFeared(bool apply) } else { - if (isAlive()) + if (IsAlive()) { if (GetMotionMaster()->GetCurrentMovementGeneratorType() == FLEEING_MOTION_TYPE) GetMotionMaster()->MovementExpired(); - if (getVictim()) - SetTarget(getVictim()->GetGUID()); + if (GetVictim()) + SetTarget(GetVictim()->GetGUID()); } } @@ -14576,12 +14576,12 @@ void Unit::SetConfused(bool apply) } else { - if (isAlive()) + if (IsAlive()) { if (GetMotionMaster()->GetCurrentMovementGeneratorType() == CONFUSED_MOTION_TYPE) GetMotionMaster()->MovementExpired(); - if (getVictim()) - SetTarget(getVictim()->GetGUID()); + if (GetVictim()) + SetTarget(GetVictim()->GetGUID()); } } @@ -14742,7 +14742,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au void Unit::RemoveCharmedBy(Unit* charmer) { - if (!isCharmed()) + if (!IsCharmed()) return; if (!charmer) @@ -14787,7 +14787,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) { creature->AIM_Initialize(); - if (creature->AI() && charmer && charmer->isAlive()) + if (creature->AI() && charmer && charmer->IsAlive()) creature->AI()->AttackStart(charmer); } } @@ -14845,7 +14845,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) // a guardian should always have charminfo if (charmer->GetTypeId() == TYPEID_PLAYER && this != charmer->GetFirstControlled()) charmer->ToPlayer()->SendRemoveControlBar(); - else if (GetTypeId() == TYPEID_PLAYER || (GetTypeId() == TYPEID_UNIT && !ToCreature()->isGuardian())) + else if (GetTypeId() == TYPEID_PLAYER || (GetTypeId() == TYPEID_UNIT && !ToCreature()->IsGuardian())) DeleteCharmInfo(); } @@ -14866,7 +14866,7 @@ void Unit::RestoreFaction() if (CreatureTemplate const* cinfo = ToCreature()->GetCreatureTemplate()) // normal creature { - FactionTemplateEntry const* faction = getFactionTemplateEntry(); + FactionTemplateEntry const* faction = GetFactionTemplateEntry(); setFaction((faction && faction->friendlyMask & 0x004) ? cinfo->faction_H : cinfo->faction_A); } } @@ -14992,33 +14992,33 @@ void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap) for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* Target = itr->getSource(); + Player* Target = itr->GetSource(); // IsHostileTo check duel and controlled by enemy if (Target && Target->GetSubGroup() == subgroup && !IsHostileTo(Target)) { - if (Target->isAlive() && IsInMap(Target)) + if (Target->IsAlive() && IsInMap(Target)) TagUnitMap.push_back(Target); if (Guardian* pet = Target->GetGuardianPet()) - if (pet->isAlive() && IsInMap(Target)) + if (pet->IsAlive() && IsInMap(Target)) TagUnitMap.push_back(pet); } } } else { - if (owner->isAlive() && (owner == this || IsInMap(owner))) + if (owner->IsAlive() && (owner == this || IsInMap(owner))) TagUnitMap.push_back(owner); if (Guardian* pet = owner->GetGuardianPet()) - if (pet->isAlive() && (pet == this || IsInMap(pet))) + if (pet->IsAlive() && (pet == this || IsInMap(pet))) TagUnitMap.push_back(pet); } } bool Unit::IsContestedGuard() const { - if (FactionTemplateEntry const* entry = getFactionTemplateEntry()) + if (FactionTemplateEntry const* entry = GetFactionTemplateEntry()) return entry->IsContestedGuardFaction(); return false; @@ -15041,7 +15041,7 @@ Aura* Unit::AddAura(uint32 spellId, Unit* target) if (!spellInfo) return NULL; - if (!target->isAlive() && !(spellInfo->Attributes & SPELL_ATTR0_PASSIVE) && !(spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_DEAD)) + if (!target->IsAlive() && !(spellInfo->Attributes & SPELL_ATTR0_PASSIVE) && !(spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_DEAD)) return NULL; return AddAura(spellInfo, MAX_EFFECT_MASK, target); @@ -15177,14 +15177,14 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) RemoveNotOwnSingleTargetAuras(newPhaseMask); // we can lost access to caster or target // modify hostile references for new phasemask, some special cases deal with hostile references themselves - if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->isGameMaster() && !ToPlayer()->GetSession()->PlayerLogout())) + if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->IsGameMaster() && !ToPlayer()->GetSession()->PlayerLogout())) { HostileRefManager& refManager = getHostileRefManager(); HostileReference* ref = refManager.getFirst(); while (ref) { - if (Unit* unit = ref->getSource()->getOwner()) + if (Unit* unit = ref->GetSource()->GetOwner()) if (Creature* creature = unit->ToCreature()) refManager.setOnlineOfflineState(creature, creature->InSamePhase(newPhaseMask)); @@ -15300,7 +15300,7 @@ float Unit::GetCombatRatingReduction(CombatRating cr) const if (Player const* player = ToPlayer()) return player->GetRatingBonusValue(cr); // Player's pet get resilience from owner - else if (isPet() && GetOwner()) + else if (IsPet() && GetOwner()) if (Player* owner = GetOwner()->ToPlayer()) return owner->GetRatingBonusValue(cr); @@ -15854,7 +15854,7 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a // Must be called only from aura handler ASSERT(aurApp); - if (!isAlive() || GetVehicleKit() == vehicle || vehicle->GetBase()->IsOnVehicle(this)) + if (!IsAlive() || GetVehicleKit() == vehicle || vehicle->GetBase()->IsOnVehicle(this)) return; if (m_vehicle) @@ -15873,7 +15873,7 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a if (Player* player = ToPlayer()) { - if (vehicle->GetBase()->GetTypeId() == TYPEID_PLAYER && player->isInCombat()) + if (vehicle->GetBase()->GetTypeId() == TYPEID_PLAYER && player->IsInCombat()) { vehicle->GetBase()->RemoveAura(const_cast<AuraApplication*>(aurApp)); return; @@ -16493,9 +16493,9 @@ void Unit::RewardRage(uint32 baseRage, bool attacker) void Unit::StopAttackFaction(uint32 faction_id) { - if (Unit* victim = getVictim()) + if (Unit* victim = GetVictim()) { - if (victim->getFactionTemplateEntry()->faction == faction_id) + if (victim->GetFactionTemplateEntry()->faction == faction_id) { AttackStop(); if (IsNonMeleeSpellCasted(false)) @@ -16510,7 +16510,7 @@ void Unit::StopAttackFaction(uint32 faction_id) AttackerSet const& attackers = getAttackers(); for (AttackerSet::const_iterator itr = attackers.begin(); itr != attackers.end();) { - if ((*itr)->getFactionTemplateEntry()->faction == faction_id) + if ((*itr)->GetFactionTemplateEntry()->faction == faction_id) { (*itr)->AttackStop(); itr = attackers.begin(); @@ -16866,7 +16866,7 @@ void Unit::ReleaseFocus(Spell const* focusSpell) return; _focusSpell = NULL; - if (Unit* victim = getVictim()) + if (Unit* victim = GetVictim()) SetUInt64Value(UNIT_FIELD_TARGET, victim->GetGUID()); else SetUInt64Value(UNIT_FIELD_TARGET, 0); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index f164b04644b..3e8abdd404b 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1325,7 +1325,7 @@ class Unit : public WorldObject void RemoveAllAttackers(); AttackerSet const& getAttackers() const { return m_attackers; } bool isAttackingPlayer() const; - Unit* getVictim() const { return m_attacking; } + Unit* GetVictim() const { return m_attacking; } void CombatStop(bool includingCast = false); void CombatStopWithPets(bool includingCast = false); @@ -1341,11 +1341,11 @@ class Unit : public WorldObject uint32 HasUnitTypeMask(uint32 mask) const { return mask & m_unitTypeMask; } void AddUnitTypeMask(uint32 mask) { m_unitTypeMask |= mask; } - bool isSummon() const { return m_unitTypeMask & UNIT_MASK_SUMMON; } - bool isGuardian() const { return m_unitTypeMask & UNIT_MASK_GUARDIAN; } - bool isPet() const { return m_unitTypeMask & UNIT_MASK_PET; } - bool isHunterPet() const{ return m_unitTypeMask & UNIT_MASK_HUNTER_PET; } - bool isTotem() const { return m_unitTypeMask & UNIT_MASK_TOTEM; } + bool IsSummon() const { return m_unitTypeMask & UNIT_MASK_SUMMON; } + bool IsGuardian() const { return m_unitTypeMask & UNIT_MASK_GUARDIAN; } + bool IsPet() const { return m_unitTypeMask & UNIT_MASK_PET; } + bool IsHunterPet() const{ return m_unitTypeMask & UNIT_MASK_HUNTER_PET; } + bool IsTotem() const { return m_unitTypeMask & UNIT_MASK_TOTEM; } bool IsVehicle() const { return m_unitTypeMask & UNIT_MASK_VEHICLE; } uint8 getLevel() const { return uint8(GetUInt32Value(UNIT_FIELD_LEVEL)); } @@ -1406,7 +1406,7 @@ class Unit : public WorldObject // faction template id uint32 getFaction() const { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); } void setFaction(uint32 faction) { SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction); } - FactionTemplateEntry const* getFactionTemplateEntry() const; + FactionTemplateEntry const* GetFactionTemplateEntry() const; ReputationRank GetReactionTo(Unit const* target) const; ReputationRank static GetFactionReactionTo(FactionTemplateEntry const* factionTemplateEntry, Unit const* target); @@ -1497,26 +1497,26 @@ class Unit : public WorldObject MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit* victim, WeaponAttackType attType) const; MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const; - bool isVendor() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR); } - bool isTrainer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TRAINER); } - bool isQuestGiver() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - bool isGossip() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - bool isTaxi() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_FLIGHTMASTER); } - bool isGuildMaster() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PETITIONER); } - bool isBattleMaster() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BATTLEMASTER); } - bool isBanker() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BANKER); } - bool isInnkeeper() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_INNKEEPER); } - bool isSpiritHealer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER); } - bool isSpiritGuide() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITGUIDE); } - bool isTabardDesigner()const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TABARDDESIGNER); } - bool isAuctioner() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_AUCTIONEER); } - bool isArmorer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_REPAIR); } - bool isServiceProvider() const; - bool isSpiritService() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER | UNIT_NPC_FLAG_SPIRITGUIDE); } - - bool isInFlight() const { return HasUnitState(UNIT_STATE_IN_FLIGHT); } - - bool isInCombat() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); } + bool IsVendor() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR); } + bool IsTrainer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TRAINER); } + bool IsQuestGiver() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } + bool IsGossip() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } + bool IsTaxi() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_FLIGHTMASTER); } + bool IsGuildMaster() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PETITIONER); } + bool IsBattleMaster() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BATTLEMASTER); } + bool IsBanker() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BANKER); } + bool IsInnkeeper() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_INNKEEPER); } + bool IsSpiritHealer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER); } + bool IsSpiritGuide() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITGUIDE); } + bool IsTabardDesigner()const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TABARDDESIGNER); } + bool IsAuctioner() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_AUCTIONEER); } + bool IsArmorer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_REPAIR); } + bool IsServiceProvider() const; + bool IsSpiritService() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER | UNIT_NPC_FLAG_SPIRITGUIDE); } + + bool IsInFlight() const { return HasUnitState(UNIT_STATE_IN_FLIGHT); } + + bool IsInCombat() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); } void CombatStart(Unit* target, bool initialAggro = true); void SetInCombatState(bool PvP, Unit* enemy = NULL); void SetInCombatWith(Unit* enemy); @@ -1630,7 +1630,7 @@ class Unit : public WorldObject void SendClearTarget(); - bool isAlive() const { return (m_deathState == ALIVE); } + bool IsAlive() const { return (m_deathState == ALIVE); } bool isDying() const { return (m_deathState == JUST_DIED); } bool isDead() const { return (m_deathState == DEAD || m_deathState == CORPSE); } DeathState getDeathState() const { return m_deathState; } @@ -1653,7 +1653,7 @@ class Unit : public WorldObject bool IsControlledByPlayer() const { return m_ControlledByPlayer; } uint64 GetCharmerOrOwnerGUID() const; uint64 GetCharmerOrOwnerOrOwnGUID() const; - bool isCharmedOwnedByPlayerOrPlayer() const { return IS_PLAYER_GUID(GetCharmerOrOwnerOrOwnGUID()); } + bool IsCharmedOwnedByPlayerOrPlayer() const { return IS_PLAYER_GUID(GetCharmerOrOwnerOrOwnGUID()); } Player* GetSpellModOwner() const; @@ -1680,7 +1680,7 @@ class Unit : public WorldObject Unit* GetFirstControlled() const; void RemoveAllControlled(); - bool isCharmed() const { return GetCharmerGUID() != 0; } + bool IsCharmed() const { return GetCharmerGUID() != 0; } bool isPossessed() const { return HasUnitState(UNIT_STATE_POSSESSED); } bool isPossessedByPlayer() const; bool isPossessing() const; @@ -2132,14 +2132,14 @@ class Unit : public WorldObject virtual bool isBeingLoaded() const { return false;} bool IsDuringRemoveFromWorld() const {return m_duringRemoveFromWorld;} - Pet* ToPet() { if (isPet()) return reinterpret_cast<Pet*>(this); else return NULL; } - Pet const* ToPet() const { if (isPet()) return reinterpret_cast<Pet const*>(this); else return NULL; } + Pet* ToPet() { if (IsPet()) return reinterpret_cast<Pet*>(this); else return NULL; } + Pet const* ToPet() const { if (IsPet()) return reinterpret_cast<Pet const*>(this); else return NULL; } - Totem* ToTotem() { if (isTotem()) return reinterpret_cast<Totem*>(this); else return NULL; } - Totem const* ToTotem() const { if (isTotem()) return reinterpret_cast<Totem const*>(this); else return NULL; } + Totem* ToTotem() { if (IsTotem()) return reinterpret_cast<Totem*>(this); else return NULL; } + Totem const* ToTotem() const { if (IsTotem()) return reinterpret_cast<Totem const*>(this); else return NULL; } - TempSummon* ToTempSummon() { if (isSummon()) return reinterpret_cast<TempSummon*>(this); else return NULL; } - TempSummon const* ToTempSummon() const { if (isSummon()) return reinterpret_cast<TempSummon const*>(this); else return NULL; } + TempSummon* ToTempSummon() { if (IsSummon()) return reinterpret_cast<TempSummon*>(this); else return NULL; } + TempSummon const* ToTempSummon() const { if (IsSummon()) return reinterpret_cast<TempSummon const*>(this); else return NULL; } void SetTarget(uint64 guid); diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 54e1ca6a5d6..df482411a0d 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1330,25 +1330,21 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) itr->second.equipement_id_prev = creature->GetCurrentEquipmentId(); itr->second.modelid_prev = creature->GetDisplayId(); creature->LoadEquipment(itr->second.equipment_id, true); - if (itr->second.modelid > 0 && itr->second.modelid_prev != itr->second.modelid) + if (itr->second.modelid > 0 && itr->second.modelid_prev != itr->second.modelid && + sObjectMgr->GetCreatureModelInfo(itr->second.modelid)) { - if (CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelInfo(itr->second.modelid)) - { - creature->SetDisplayId(itr->second.modelid); - creature->SetNativeDisplayId(itr->second.modelid); - } + creature->SetDisplayId(itr->second.modelid); + creature->SetNativeDisplayId(itr->second.modelid); } } else { creature->LoadEquipment(itr->second.equipement_id_prev, true); - if (itr->second.modelid_prev > 0 && itr->second.modelid_prev != itr->second.modelid) + if (itr->second.modelid_prev > 0 && itr->second.modelid_prev != itr->second.modelid && + sObjectMgr->GetCreatureModelInfo(itr->second.modelid_prev)) { - if (CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelInfo(itr->second.modelid_prev)) - { - creature->SetDisplayId(itr->second.modelid_prev); - creature->SetNativeDisplayId(itr->second.modelid_prev); - } + creature->SetDisplayId(itr->second.modelid_prev); + creature->SetNativeDisplayId(itr->second.modelid_prev); } } } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 2fb304c52e7..03b0cf90246 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -197,7 +197,7 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke Unit const* summoner = NULL; // Check summoners for party - if (clickee->isSummon()) + if (clickee->IsSummon()) summoner = clickee->ToTempSummon()->GetSummoner(); if (!summoner) summoner = clickee; diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 088189737a9..363d6927cc1 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -76,17 +76,17 @@ void VisibleChangesNotifier::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - if (iter->getSource() == &i_object) + if (iter->GetSource() == &i_object) continue; - iter->getSource()->UpdateVisibilityOf(&i_object); + iter->GetSource()->UpdateVisibilityOf(&i_object); - if (iter->getSource()->HasSharedVision()) + if (iter->GetSource()->HasSharedVision()) { - for (SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); - i != iter->getSource()->GetSharedVisionList().end(); ++i) + for (SharedVisionList::const_iterator i = iter->GetSource()->GetSharedVisionList().begin(); + i != iter->GetSource()->GetSharedVisionList().end(); ++i) { - if ((*i)->m_seer == iter->getSource()) + if ((*i)->m_seer == iter->GetSource()) (*i)->UpdateVisibilityOf(&i_object); } } @@ -96,29 +96,29 @@ void VisibleChangesNotifier::Visit(PlayerMapType &m) void VisibleChangesNotifier::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) - if (iter->getSource()->HasSharedVision()) - for (SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); - i != iter->getSource()->GetSharedVisionList().end(); ++i) - if ((*i)->m_seer == iter->getSource()) + if (iter->GetSource()->HasSharedVision()) + for (SharedVisionList::const_iterator i = iter->GetSource()->GetSharedVisionList().begin(); + i != iter->GetSource()->GetSharedVisionList().end(); ++i) + if ((*i)->m_seer == iter->GetSource()) (*i)->UpdateVisibilityOf(&i_object); } void VisibleChangesNotifier::Visit(DynamicObjectMapType &m) { for (DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) - if (IS_PLAYER_GUID(iter->getSource()->GetCasterGUID())) - if (Player* caster = (Player*)iter->getSource()->GetCaster()) - if (caster->m_seer == iter->getSource()) + if (IS_PLAYER_GUID(iter->GetSource()->GetCasterGUID())) + if (Player* caster = (Player*)iter->GetSource()->GetCaster()) + if (caster->m_seer == iter->GetSource()) caster->UpdateVisibilityOf(&i_object); } inline void CreatureUnitRelocationWorker(Creature* c, Unit* u) { - if (!u->isAlive() || !c->isAlive() || c == u || u->isInFlight()) + if (!u->IsAlive() || !c->IsAlive() || c == u || u->IsInFlight()) return; if (c->HasReactState(REACT_AGGRESSIVE) && !c->HasUnitState(UNIT_STATE_SIGHTLESS)) - if (c->IsAIEnabled && c->canSeeOrDetect(u, false, true)) + if (c->IsAIEnabled && c->CanSeeOrDetect(u, false, true)) c->AI()->MoveInLineOfSight_Safe(u); } @@ -126,7 +126,7 @@ void PlayerRelocationNotifier::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Player* player = iter->getSource(); + Player* player = iter->GetSource(); vis_guids.erase(player->GetGUID()); @@ -145,7 +145,7 @@ void PlayerRelocationNotifier::Visit(CreatureMapType &m) for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { - Creature* c = iter->getSource(); + Creature* c = iter->GetSource(); vis_guids.erase(c->GetGUID()); @@ -160,7 +160,7 @@ void CreatureRelocationNotifier::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Player* player = iter->getSource(); + Player* player = iter->GetSource(); if (!player->m_seer->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) player->UpdateVisibilityOf(&i_creature); @@ -171,12 +171,12 @@ void CreatureRelocationNotifier::Visit(PlayerMapType &m) void CreatureRelocationNotifier::Visit(CreatureMapType &m) { - if (!i_creature.isAlive()) + if (!i_creature.IsAlive()) return; for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Creature* c = iter->getSource(); + Creature* c = iter->GetSource(); CreatureUnitRelocationWorker(&i_creature, c); if (!c->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) @@ -188,7 +188,7 @@ void DelayedUnitRelocation::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Creature* unit = iter->getSource(); + Creature* unit = iter->GetSource(); if (!unit->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) continue; @@ -206,7 +206,7 @@ void DelayedUnitRelocation::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Player* player = iter->getSource(); + Player* player = iter->GetSource(); WorldObject const* viewPoint = player->m_seer; if (!viewPoint->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) @@ -234,7 +234,7 @@ void AIRelocationNotifier::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Creature* c = iter->getSource(); + Creature* c = iter->GetSource(); CreatureUnitRelocationWorker(c, &i_unit); if (isCreature) CreatureUnitRelocationWorker((Creature*)&i_unit, c); @@ -245,7 +245,7 @@ void MessageDistDeliverer::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Player* target = iter->getSource(); + Player* target = iter->GetSource(); if (!target->InSamePhase(i_phaseMask)) continue; @@ -270,7 +270,7 @@ void MessageDistDeliverer::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Creature* target = iter->getSource(); + Creature* target = iter->GetSource(); if (!target->InSamePhase(i_phaseMask)) continue; @@ -292,7 +292,7 @@ void MessageDistDeliverer::Visit(DynamicObjectMapType &m) { for (DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - DynamicObject* target = iter->getSource(); + DynamicObject* target = iter->GetSource(); if (!target->InSamePhase(i_phaseMask)) continue; @@ -325,14 +325,14 @@ void ObjectUpdater::Visit(GridRefManager<T> &m) { for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) { - if (iter->getSource()->IsInWorld()) - iter->getSource()->Update(i_timeDiff); + if (iter->GetSource()->IsInWorld()) + iter->GetSource()->Update(i_timeDiff); } } bool AnyDeadUnitObjectInRangeCheck::operator()(Player* u) { - return !u->isAlive() && !u->HasAuraType(SPELL_AURA_GHOST) && i_searchObj->IsWithinDistInMap(u, i_range); + return !u->IsAlive() && !u->HasAuraType(SPELL_AURA_GHOST) && i_searchObj->IsWithinDistInMap(u, i_range); } bool AnyDeadUnitObjectInRangeCheck::operator()(Corpse* u) @@ -342,7 +342,7 @@ bool AnyDeadUnitObjectInRangeCheck::operator()(Corpse* u) bool AnyDeadUnitObjectInRangeCheck::operator()(Creature* u) { - return !u->isAlive() && i_searchObj->IsWithinDistInMap(u, i_range); + return !u->IsAlive() && i_searchObj->IsWithinDistInMap(u, i_range); } bool AnyDeadUnitSpellTargetInRangeCheck::operator()(Player* u) diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 073546d7764..6984321e55b 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -111,7 +111,7 @@ namespace Trinity template<class T> void updateObjects(GridRefManager<T> &m) { for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) - iter->getSource()->Update(i_timeDiff); + iter->GetSource()->Update(i_timeDiff); } void Visit(PlayerMapType &m) { updateObjects<Player>(m); } @@ -247,8 +247,8 @@ namespace Trinity if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_GAMEOBJECT)) return; for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } void Visit(PlayerMapType &m) @@ -256,16 +256,16 @@ namespace Trinity if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_PLAYER)) return; for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } void Visit(CreatureMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CREATURE)) return; for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } void Visit(CorpseMapType &m) @@ -273,8 +273,8 @@ namespace Trinity if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CORPSE)) return; for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } void Visit(DynamicObjectMapType &m) @@ -282,8 +282,8 @@ namespace Trinity if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_DYNAMICOBJECT)) return; for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } void Visit(AreaTriggerMapType &m) @@ -291,8 +291,8 @@ namespace Trinity if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_AREATRIGGER)) return; for (AreaTriggerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} @@ -355,8 +355,8 @@ namespace Trinity void Visit(GameObjectMapType& m) { for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(_phaseMask)) - _func(itr->getSource()); + if (itr->GetSource()->InSamePhase(_phaseMask)) + _func(itr->GetSource()); } template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} @@ -479,8 +479,8 @@ namespace Trinity void Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} @@ -546,8 +546,8 @@ namespace Trinity void Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + i_do(itr->GetSource()); } template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} @@ -566,8 +566,8 @@ namespace Trinity void Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_searcher) && itr->getSource()->IsWithinDist(i_searcher, i_dist)) - i_do(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_searcher) && itr->GetSource()->IsWithinDist(i_searcher, i_dist)) + i_do(itr->GetSource()); } template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} @@ -754,7 +754,7 @@ namespace Trinity MostHPMissingInRange(Unit const* obj, float range, uint32 hp) : i_obj(obj), i_range(range), i_hp(hp) {} bool operator()(Unit* u) { - if (u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && u->GetMaxHealth() - u->GetHealth() > i_hp) + if (u->IsAlive() && u->IsInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && u->GetMaxHealth() - u->GetHealth() > i_hp) { i_hp = u->GetMaxHealth() - u->GetHealth(); return true; @@ -773,8 +773,8 @@ namespace Trinity FriendlyCCedInRange(Unit const* obj, float range) : i_obj(obj), i_range(range) {} bool operator()(Unit* u) { - if (u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && - (u->isFeared() || u->isCharmed() || u->isFrozen() || u->HasUnitState(UNIT_STATE_STUNNED) || u->HasUnitState(UNIT_STATE_CONFUSED))) + if (u->IsAlive() && u->IsInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && + (u->isFeared() || u->IsCharmed() || u->isFrozen() || u->HasUnitState(UNIT_STATE_STUNNED) || u->HasUnitState(UNIT_STATE_CONFUSED))) { return true; } @@ -791,7 +791,7 @@ namespace Trinity FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range), i_spell(spellid) {} bool operator()(Unit* u) { - if (u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && + if (u->IsAlive() && u->IsInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && !(u->HasAura(i_spell))) { return true; @@ -810,7 +810,7 @@ namespace Trinity AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {} bool operator()(Unit* u) { - if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u)) + if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u)) return true; else return false; @@ -827,13 +827,13 @@ namespace Trinity AnyUnfriendlyNoTotemUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {} bool operator()(Unit* u) { - if (!u->isAlive()) + if (!u->IsAlive()) return false; if (u->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) return false; - if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isTotem()) + if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->IsTotem()) return false; if (!u->isTargetableForAttack(false)) @@ -855,12 +855,12 @@ namespace Trinity bool operator()(const Unit* u) { - return u->isAlive() + return u->IsAlive() && i_funit->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u) && i_funit->IsValidAttackTarget(u) && u->GetCreatureType() != CREATURE_TYPE_CRITTER - && i_funit->canSeeOrDetect(u); + && i_funit->CanSeeOrDetect(u); } private: Unit const* i_funit; @@ -886,7 +886,7 @@ namespace Trinity AnyFriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {} bool operator()(Unit* u) { - if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u)) + if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u)) return true; else return false; @@ -911,7 +911,7 @@ namespace Trinity else if (!_refUnit->IsInPartyWith(u)) return false; - return !_refUnit->IsHostileTo(u) && u->isAlive() && _source->IsWithinDistInMap(u, _range); + return !_refUnit->IsHostileTo(u) && u->IsAlive() && _source->IsWithinDistInMap(u, _range); } private: @@ -927,7 +927,7 @@ namespace Trinity AnyUnitInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range) {} bool operator()(Unit* u) { - if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range)) + if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range)) return true; return false; @@ -945,7 +945,7 @@ namespace Trinity bool operator()(Unit* u) { if (u->isTargetableForAttack() && i_obj->IsWithinDistInMap(u, i_range) && - !i_funit->IsFriendlyTo(u) && i_funit->canSeeOrDetect(u)) + !i_funit->IsFriendlyTo(u) && i_funit->CanSeeOrDetect(u)) { i_range = i_obj->GetDistance(u); // use found unit range as new range limit for next check return true; @@ -979,7 +979,7 @@ namespace Trinity bool operator()(Unit* u) { // Check contains checks for: live, non-selectable, non-attackable flags, flight check and GM check, ignore totems - if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isTotem()) + if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->IsTotem()) return false; if (i_funit->_IsValidAttackTarget(u, _spellInfo, i_obj->GetTypeId() == TYPEID_DYNAMICOBJECT ? i_obj : NULL) && i_obj->IsWithinDistInMap(u, i_range)) @@ -1029,7 +1029,7 @@ namespace Trinity struct AnyDeadUnitCheck { - bool operator()(Unit* u) { return !u->isAlive(); } + bool operator()(Unit* u) { return !u->IsAlive(); } }; /* @@ -1079,7 +1079,7 @@ namespace Trinity if (!me->IsWithinDistInMap(u, m_range)) return false; - if (!me->canSeeOrDetect(u)) + if (!me->CanSeeOrDetect(u)) return false; if (m_force) @@ -1087,7 +1087,7 @@ namespace Trinity if (!me->IsValidAttackTarget(u)) return false; } - else if (!me->canStartAttack(u, false)) + else if (!me->CanStartAttack(u, false)) return false; m_range = me->GetDistance(u); // use found unit range as new range limit for next check @@ -1202,7 +1202,7 @@ namespace Trinity bool operator()(Creature* u) { - if (u->GetEntry() == i_entry && u->isAlive() == i_alive && i_obj.IsWithinDistInMap(u, i_range)) + if (u->GetEntry() == i_entry && u->IsAlive() == i_alive && i_obj.IsWithinDistInMap(u, i_range)) { i_range = i_obj.GetDistance(u); // use found unit range as new range limit for next check return true; @@ -1226,7 +1226,7 @@ namespace Trinity AnyPlayerInObjectRangeCheck(WorldObject const* obj, float range, bool reqAlive = true) : _obj(obj), _range(range), _reqAlive(reqAlive) {} bool operator()(Player* u) { - if (_reqAlive && !u->isAlive()) + if (_reqAlive && !u->IsAlive()) return false; if (!_obj->IsWithinDistInMap(u, _range)) @@ -1250,7 +1250,7 @@ namespace Trinity bool operator()(Player* u) { - if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range)) + if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range)) { i_range = i_obj->GetDistance(u); return true; @@ -1271,7 +1271,7 @@ namespace Trinity AllFriendlyCreaturesInGrid(Unit const* obj) : unit(obj) {} bool operator() (Unit* u) { - if (u->isAlive() && u->IsVisible() && u->IsFriendlyTo(unit)) + if (u->IsAlive() && u->IsVisible() && u->IsFriendlyTo(unit)) return true; return false; @@ -1322,7 +1322,7 @@ namespace Trinity bool operator() (Player* player) { //No threat list check, must be done explicit if expected to be in combat with creature - if (!player->isGameMaster() && player->isAlive() && !unit->IsWithinDist(player, fRange, false)) + if (!player->IsGameMaster() && player->IsAlive() && !unit->IsWithinDist(player, fRange, false)) return true; return false; diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 6c7d69e57a0..3e71794a7e7 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -33,16 +33,16 @@ inline void Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) { for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) { - vis_guids.erase(iter->getSource()->GetGUID()); - i_player.UpdateVisibilityOf(iter->getSource(), i_data, i_visibleNow); + vis_guids.erase(iter->GetSource()->GetGUID()); + i_player.UpdateVisibilityOf(iter->GetSource(), i_data, i_visibleNow); } } inline void Trinity::ObjectUpdater::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) - if (iter->getSource()->IsInWorld()) - iter->getSource()->Update(i_timeDiff); + if (iter->GetSource()->IsInWorld()) + iter->GetSource()->Update(i_timeDiff); } // SEARCHERS & LIST SEARCHERS & WORKERS @@ -61,12 +61,12 @@ void Trinity::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m) for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -84,12 +84,12 @@ void Trinity::WorldObjectSearcher<Check>::Visit(PlayerMapType &m) for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -107,12 +107,12 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CreatureMapType &m) for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -130,12 +130,12 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CorpseMapType &m) for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -153,12 +153,12 @@ void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -176,12 +176,12 @@ void Trinity::WorldObjectSearcher<Check>::Visit(AreaTriggerMapType &m) for (AreaTriggerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -195,11 +195,11 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(GameObjectMapType &m) for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -211,11 +211,11 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(PlayerMapType &m) for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -227,11 +227,11 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(CreatureMapType &m) for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -243,11 +243,11 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(CorpseMapType &m) for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -259,11 +259,11 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(DynamicObjectMapType &m) for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -275,11 +275,11 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(AreaTriggerMapType &m) for (AreaTriggerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -290,8 +290,8 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) return; for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> @@ -301,8 +301,8 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) return; for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> @@ -312,8 +312,8 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) return; for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> @@ -323,8 +323,8 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) return; for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> @@ -334,8 +334,8 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m) return; for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> @@ -345,8 +345,8 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(AreaTriggerMapType &m) return; for (AreaTriggerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } // Gameobject searchers @@ -360,12 +360,12 @@ void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -376,11 +376,11 @@ void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) { for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -388,9 +388,9 @@ template<class Check> void Trinity::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m) { for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } // Unit searchers @@ -404,12 +404,12 @@ void Trinity::UnitSearcher<Check>::Visit(CreatureMapType &m) for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -424,12 +424,12 @@ void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m) for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -440,11 +440,11 @@ void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -453,11 +453,11 @@ void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -465,18 +465,18 @@ template<class Check> void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> void Trinity::UnitListSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } // Creature searchers @@ -490,12 +490,12 @@ void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m) for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -506,11 +506,11 @@ void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } @@ -518,18 +518,18 @@ template<class Check> void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> void Trinity::PlayerListSearcher<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_phaseMask)) - if (i_check(itr->getSource())) - i_objects.push_back(itr->getSource()); + if (itr->GetSource()->InSamePhase(i_phaseMask)) + if (i_check(itr->GetSource())) + i_objects.push_back(itr->GetSource()); } template<class Check> @@ -541,12 +541,12 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m) for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) + if (i_check(itr->GetSource())) { - i_object = itr->getSource(); + i_object = itr->GetSource(); return; } } @@ -557,11 +557,11 @@ void Trinity::PlayerLastSearcher<Check>::Visit(PlayerMapType& m) { for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr) { - if (!itr->getSource()->InSamePhase(i_phaseMask)) + if (!itr->GetSource()->InSamePhase(i_phaseMask)) continue; - if (i_check(itr->getSource())) - i_object = itr->getSource(); + if (i_check(itr->GetSource())) + i_object = itr->GetSource(); } } diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 3c7833baf15..50a54cd7263 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -36,10 +36,10 @@ void ObjectGridEvacuator::Visit(CreatureMapType &m) // move to respawn point to prevent this case. For player view in respawn grid this will be normal respawn. for (CreatureMapType::iterator iter = m.begin(); iter != m.end();) { - Creature* c = iter->getSource(); + Creature* c = iter->GetSource(); ++iter; - ASSERT(!c->isPet() && "ObjectGridRespawnMover must not be called for pets"); + ASSERT(!c->IsPet() && "ObjectGridRespawnMover must not be called for pets"); c->GetMap()->CreatureRespawnRelocation(c, true); } } @@ -194,7 +194,7 @@ void ObjectGridUnloader::Visit(GridRefManager<T> &m) { while (!m.isEmpty()) { - T *obj = m.getFirst()->getSource(); + T *obj = m.getFirst()->GetSource(); // if option set then object already saved at this moment if (!sWorld->getBoolConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) obj->SaveRespawnTime(); @@ -213,13 +213,13 @@ void ObjectGridStoper::Visit(CreatureMapType &m) // stop any fights at grid de-activation and remove dynobjects created at cast by creatures for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - iter->getSource()->RemoveAllDynObjects(); - if (iter->getSource()->isInCombat()) + iter->GetSource()->RemoveAllDynObjects(); + if (iter->GetSource()->IsInCombat()) { - iter->getSource()->CombatStop(); - iter->getSource()->DeleteThreatList(); - if (iter->getSource()->IsAIEnabled) - iter->getSource()->AI()->EnterEvadeMode(); + iter->GetSource()->CombatStop(); + iter->GetSource()->DeleteThreatList(); + if (iter->GetSource()->IsAIEnabled) + iter->GetSource()->AI()->EnterEvadeMode(); } } } @@ -228,7 +228,7 @@ template<class T> void ObjectGridCleaner::Visit(GridRefManager<T> &m) { for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) - iter->getSource()->CleanupsBeforeDelete(); + iter->GetSource()->CleanupsBeforeDelete(); } template void ObjectGridUnloader::Visit(CreatureMapType &); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 9d27ca61511..03bfe56ac3e 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -474,10 +474,10 @@ bool Group::AddMember(Player* player) // Broadcast group members' fields to player for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - if (itr->getSource() == player) + if (itr->GetSource() == player) continue; - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) { if (player->HaveAtClient(member)) { @@ -626,7 +626,7 @@ bool Group::RemoveMember(uint64 guid, const RemoveMethod& method /*= GROUP_REMOV { Player* leader = ObjectAccessor::FindPlayer(GetLeaderGUID()); uint32 mapId = sLFGMgr->GetDungeonMapId(GetGUID()); - if (!mapId || !leader || (leader->isAlive() && leader->GetMapId() != mapId)) + if (!mapId || !leader || (leader->IsAlive() && leader->GetMapId() != mapId)) { Disband(); return false; @@ -959,7 +959,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject) //a vector is filled with only near party members for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); if (!member || !member->GetSession()) continue; if (i->AllowedForPlayer(member)) @@ -1043,7 +1043,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject) //a vector is filled with only near party members for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); if (!member || !member->GetSession()) continue; @@ -1103,7 +1103,7 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject) for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* playerToRoll = itr->getSource(); + Player* playerToRoll = itr->GetSource(); if (!playerToRoll || !playerToRoll->GetSession()) continue; @@ -1178,7 +1178,7 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject) for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* playerToRoll = itr->getSource(); + Player* playerToRoll = itr->GetSource(); if (!playerToRoll || !playerToRoll->GetSession()) continue; @@ -1239,7 +1239,7 @@ void Group::MasterLoot(Loot* /*loot*/, WorldObject* pLootedObject) for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* looter = itr->getSource(); + Player* looter = itr->GetSource(); if (!looter->IsInWorld()) continue; @@ -1254,7 +1254,7 @@ void Group::MasterLoot(Loot* /*loot*/, WorldObject* pLootedObject) for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* looter = itr->getSource(); + Player* looter = itr->GetSource(); if (looter->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) looter->GetSession()->SendPacket(&data); } @@ -1574,7 +1574,7 @@ void Group::UpdatePlayerOutOfRange(Player* player) Player* member; for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - member = itr->getSource(); + member = itr->GetSource(); if (member && !member->IsWithinDist(player, member->GetSightRange(), false)) member->GetSession()->SendPacket(&data); } @@ -1584,7 +1584,7 @@ void Group::BroadcastAddonMessagePacket(WorldPacket* packet, const std::string& { for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player || (ignore != 0 && player->GetGUID() == ignore) || (ignorePlayersInBGRaid && player->GetGroup() != this)) continue; @@ -1599,7 +1599,7 @@ void Group::BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int { for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player || (ignore != 0 && player->GetGUID() == ignore) || (ignorePlayersInBGRaid && player->GetGroup() != this)) continue; @@ -1612,7 +1612,7 @@ void Group::BroadcastReadyCheck(WorldPacket* packet) { for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (player && player->GetSession()) if (IsLeader(player->GetGUID()) || IsAssistant(player->GetGUID())) player->GetSession()->SendPacket(packet); @@ -1818,7 +1818,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* return ERR_BATTLEGROUND_NONE; // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.) - Player* reference = GetFirstMember()->getSource(); + Player* reference = GetFirstMember()->GetSource(); // no reference found, can't join this way if (!reference) return ERR_BATTLEGROUND_JOIN_FAILED; @@ -1836,7 +1836,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* memberscount = 0; for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next(), ++memberscount) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); // offline member? don't let join if (!member) return ERR_BATTLEGROUND_JOIN_FAILED; @@ -1902,7 +1902,7 @@ void Group::SetDungeonDifficulty(Difficulty difficulty) for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player->GetSession()) continue; @@ -1926,7 +1926,7 @@ void Group::SetRaidDifficulty(Difficulty difficulty) for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player->GetSession()) continue; @@ -1939,7 +1939,7 @@ bool Group::InCombatToInstance(uint32 instanceId) { for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (player && !player->getAttackers().empty() && player->GetInstanceId() == instanceId && (player->GetMap()->IsRaidOrHeroicDungeon())) for (std::set<Unit*>::const_iterator i = player->getAttackers().begin(); i != player->getAttackers().end(); ++i) if ((*i) && (*i)->GetTypeId() == TYPEID_UNIT && (*i)->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND) @@ -2114,7 +2114,7 @@ void Group::UnbindInstance(uint32 mapid, uint8 difficulty, bool unload) void Group::_homebindIfInstance(Player* player) { - if (player && !player->isGameMaster() && sMapStore.LookupEntry(player->GetMapId())->IsDungeon()) + if (player && !player->IsGameMaster() && sMapStore.LookupEntry(player->GetMapId())->IsDungeon()) player->m_InstanceValid = false; } @@ -2382,7 +2382,7 @@ void Group::DelinkMember(uint64 guid) while (ref) { GroupReference* nextRef = ref->next(); - if (ref->getSource()->GetGUID() == guid) + if (ref->GetSource()->GetGUID() == guid) { ref->unlink(); break; diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index c4855cd2fd5..16063e39657 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -45,7 +45,7 @@ void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recvData) if (!unit) return; - if (!unit->isBattleMaster()) // it's not battlemaster + if (!unit->IsBattleMaster()) // it's not battlemaster return; // Stop the npc if moving @@ -236,7 +236,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData) for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); if (!member) continue; // this should never happen @@ -526,13 +526,13 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recvData) _player->SetBattlegroundEntryPoint(); // resurrect the player - if (!_player->isAlive()) + if (!_player->IsAlive()) { _player->ResurrectPlayer(1.0f); _player->SpawnCorpseBones(); } // stop taxi flight at port - if (_player->isInFlight()) + if (_player->IsInFlight()) { _player->GetMotionMaster()->MovementExpired(); _player->CleanupAfterTaxiFlight(); @@ -590,7 +590,7 @@ void WorldSession::HandleBattlefieldLeaveOpcode(WorldPacket& /*recvData*/) TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEFIELD_LEAVE Message"); // not allow leave battleground in combat - if (_player->isInCombat()) + if (_player->IsInCombat()) if (Battleground* bg = _player->GetBattleground()) if (bg->GetStatus() != STATUS_WAIT_LEAVE) return; @@ -742,7 +742,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData) for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); if (!member) continue; diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 85a76760c7e..bb7d4b1052f 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1067,7 +1067,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) pCurrChar->LoadPet(); // Set FFA PvP for non GM in non-rest mode - if (sWorld->IsFFAPvPRealm() && !pCurrChar->isGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING)) + if (sWorld->IsFFAPvPRealm() && !pCurrChar->IsGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING)) pCurrChar->SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); if (pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP)) @@ -1120,7 +1120,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) if (sWorld->getBoolConfig(CONFIG_ALL_TAXI_PATHS)) pCurrChar->SetTaxiCheater(true); - if (pCurrChar->isGameMaster()) + if (pCurrChar->IsGameMaster()) SendNotification(LANG_GM_ON); std::string IP_str = GetRemoteAddress(); @@ -1690,7 +1690,7 @@ void WorldSession::HandleEquipmentSetDelete(WorldPacket &recvData) void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData) { - if (_player->isInCombat()) + if (_player->IsInCombat()) return; TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_USE"); diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 9ec018aaf78..1c5741cbad8 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -174,7 +174,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) else { // send in universal language if player in .gm on mode (ignore spell effects) - if (sender->isGameMaster()) + if (sender->IsGameMaster()) lang = LANG_UNIVERSAL; else { @@ -326,7 +326,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) SendPlayerNotFoundNotice(to); return; } - if (!sender->isGameMaster() && sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) && !receiver->IsInWhisperWhiteList(sender->GetGUID())) + if (!sender->IsGameMaster() && sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) && !receiver->IsInWhisperWhiteList(sender->GetGUID())) { SendNotification(GetTrinityString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); return; @@ -338,7 +338,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) return; } - if (GetPlayer()->HasAura(1852) && !receiver->isGameMaster()) + if (GetPlayer()->HasAura(1852) && !receiver->IsGameMaster()) { SendNotification(GetTrinityString(LANG_GM_SILENCE), GetPlayer()->GetName().c_str()); return; @@ -470,7 +470,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) } break; case CHAT_MSG_AFK: { - if (!_player->isInCombat()) + if (!_player->IsInCombat()) { if (_player->isAFK()) // Already AFK { @@ -661,7 +661,7 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recvData) void WorldSession::HandleEmoteOpcode(WorldPacket& recvData) { - if (!GetPlayer()->isAlive() || GetPlayer()->HasUnitState(UNIT_STATE_DIED)) + if (!GetPlayer()->IsAlive() || GetPlayer()->HasUnitState(UNIT_STATE_DIED)) return; uint32 emote; @@ -704,7 +704,7 @@ namespace Trinity void WorldSession::HandleTextEmoteOpcode(WorldPacket& recvData) { - if (!GetPlayer()->isAlive()) + if (!GetPlayer()->IsAlive()) return; if (!GetPlayer()->CanSpeak()) diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 27cc50dacc5..d4bfc235595 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -115,14 +115,14 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData) } // restrict invite to GMs - if (!sWorld->getBoolConfig(CONFIG_ALLOW_GM_GROUP) && !GetPlayer()->isGameMaster() && player->isGameMaster()) + if (!sWorld->getBoolConfig(CONFIG_ALLOW_GM_GROUP) && !GetPlayer()->IsGameMaster() && player->IsGameMaster()) { SendPartyResult(PARTY_OP_INVITE, memberName, ERR_BAD_PLAYER_NAME_S); return; } // can't group with - if (!GetPlayer()->isGameMaster() && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam()) + if (!GetPlayer()->IsGameMaster() && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam()) { SendPartyResult(PARTY_OP_INVITE, memberName, ERR_PLAYER_WRONG_FACTION); return; @@ -946,7 +946,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke if (player->IsPvP()) playerStatus |= MEMBER_STATUS_PVP; - if (!player->isAlive()) + if (!player->IsAlive()) { if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) playerStatus |= MEMBER_STATUS_GHOST; @@ -1206,7 +1206,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData) if (player->IsPvP()) playerStatus |= MEMBER_STATUS_PVP; - if (!player->isAlive()) + if (!player->IsAlive()) { if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) playerStatus |= MEMBER_STATUS_GHOST; diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index f23a1c9632f..86e5004332a 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -542,7 +542,7 @@ void WorldSession::HandleListInventoryOpcode(WorldPacket& recvData) recvData >> guid; - if (!GetPlayer()->isAlive()) + if (!GetPlayer()->IsAlive()) return; TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LIST_INVENTORY"); @@ -594,7 +594,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid) continue; uint32 leftInStock = !vendorItem->maxcount ? 0xFFFFFFFF : vendor->GetVendorItemCurrentCount(vendorItem); - if (!_player->isGameMaster()) // ignore conditions if GM on + if (!_player->IsGameMaster()) // ignore conditions if GM on { // Respect allowed class if (!(itemTemplate->AllowableClass & _player->getClassMask()) && itemTemplate->Bonding == BIND_WHEN_PICKED_UP) diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 653caf23453..e19bcadc67b 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -246,7 +246,7 @@ void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData* lfg::LfgLockPartyMap lockMap; for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* plrg = itr->getSource(); + Player* plrg = itr->GetSource(); if (!plrg) continue; diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index caf9d7a65e2..3dd0ab9f6d2 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -82,7 +82,7 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData) { Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid); - bool lootAllowed = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); + bool lootAllowed = creature && creature->IsAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); if (!lootAllowed || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) { @@ -149,11 +149,11 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recvData*/) case HIGHGUID_VEHICLE: { Creature* creature = player->GetMap()->GetCreature(guid); - bool lootAllowed = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); + bool lootAllowed = creature && creature->IsAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); if (lootAllowed && creature->IsWithinDistInMap(player, INTERACTION_DISTANCE)) { loot = &creature->loot; - if (creature->isAlive()) + if (creature->IsAlive()) shareMoney = false; } break; @@ -172,7 +172,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recvData*/) std::vector<Player*> playersNear; for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* member = itr->getSource(); + Player* member = itr->GetSource(); if (!member) continue; @@ -232,7 +232,7 @@ void WorldSession::HandleLootOpcode(WorldPacket& recvData) recvData >> guid; // Check possible cheat - if (!_player->isAlive()) + if (!_player->IsAlive()) return; GetPlayer()->SendLoot(guid, LOOT_CORPSE); @@ -366,7 +366,7 @@ void WorldSession::DoLootRelease(uint64 lguid) { Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid); - bool lootAllowed = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); + bool lootAllowed = creature && creature->IsAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); if (!lootAllowed || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; @@ -374,7 +374,7 @@ void WorldSession::DoLootRelease(uint64 lguid) if (loot->isLooted()) { // skip pickpocketing loot for speed, skinning timer reduction is no-op in fact - if (!creature->isAlive()) + if (!creature->IsAlive()) creature->AllLootRemovedFromCorpse(); creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index d34ea534753..cf17ee29345 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -153,7 +153,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) uint64 reqmoney = cost + money; - if (!player->HasEnoughMoney(reqmoney) && !player->isGameMaster()) + if (!player->HasEnoughMoney(reqmoney) && !player->IsGameMaster()) { player->SendMailResult(0, MAIL_SEND, MAIL_ERR_NOT_ENOUGH_MONEY); return; diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 5a630a0bfe0..62227e14b5a 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -63,7 +63,7 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket& recvData) recvData.read_skip<uint8>(); - if (GetPlayer()->isAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) + if (GetPlayer()->IsAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) return; if (GetPlayer()->HasAuraType(SPELL_AURA_PREVENT_RESURRECTION)) @@ -373,14 +373,14 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recvData*/) if (uint64 lguid = GetPlayer()->GetLootGUID()) DoLootRelease(lguid); - bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->isInCombat()) || - GetPlayer()->isInFlight() || HasPermission(RBAC_PERM_INSTANT_LOGOUT); + bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || + GetPlayer()->IsInFlight() || HasPermission(RBAC_PERM_INSTANT_LOGOUT); /// TODO: Possibly add RBAC permission to log out in combat bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); uint32 reason = 0; - if (GetPlayer()->isInCombat() && !canLogoutInCombat) + if (GetPlayer()->IsInCombat() && !canLogoutInCombat) reason = 1; else if (GetPlayer()->m_movementInfo.HasMovementFlag(MOVEMENTFLAG_FALLING | MOVEMENTFLAG_FALLING_FAR)) reason = 3; // is jumping or falling @@ -497,7 +497,7 @@ void WorldSession::HandleZoneUpdateOpcode(WorldPacket& recvData) void WorldSession::HandleReturnToGraveyard(WorldPacket& /*recvPacket*/) { - if (GetPlayer()->isAlive() || !GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) + if (GetPlayer()->IsAlive() || !GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) return; GetPlayer()->RepopAtGraveyard(); } @@ -736,7 +736,7 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket& recvData) uint64 guid; recvData >> guid; - if (GetPlayer()->isAlive()) + if (GetPlayer()->IsAlive()) return; // do not allow corpse reclaim in arena @@ -775,7 +775,7 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData) recvData >> guid; recvData >> status; - if (GetPlayer()->isAlive()) + if (GetPlayer()->IsAlive()) return; if (status == 0) @@ -815,7 +815,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData) TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "CMSG_AREATRIGGER. Trigger ID: %u", triggerId); Player* player = GetPlayer(); - if (player->isInFlight()) + if (player->IsInFlight()) { TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u", player->GetName().c_str(), player->GetGUIDLow(), triggerId); @@ -889,7 +889,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData) if (sScriptMgr->OnAreaTrigger(player, atEntry)) return; - if (player->isAlive()) + if (player->IsAlive()) if (uint32 questId = sObjectMgr->GetQuestForAreaTrigger(triggerId)) if (player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(questId); @@ -1209,7 +1209,7 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recvData) WorldPacket data(SMSG_INSPECT_TALENT, 8 + 4 + 1 + 1 + talent_points + 8 + 4 + 8 + 4); data << player->GetGUID(); - if (sWorld->getBoolConfig(CONFIG_TALENTS_INSPECTING) || _player->isGameMaster()) + if (sWorld->getBoolConfig(CONFIG_TALENTS_INSPECTING) || _player->IsGameMaster()) player->BuildPlayerTalentsInfoData(&data); else { @@ -1300,7 +1300,7 @@ void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recvData) TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_WORLD_TELEPORT"); - if (GetPlayer()->isInFlight()) + if (GetPlayer()->IsInFlight()) { TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore worldport command.", GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow()); @@ -1546,7 +1546,7 @@ void WorldSession::HandleSetDungeonDifficultyOpcode(WorldPacket& recvData) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* groupGuy = itr->getSource(); + Player* groupGuy = itr->GetSource(); if (!groupGuy) continue; @@ -1604,7 +1604,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket& recvData) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* groupGuy = itr->getSource(); + Player* groupGuy = itr->GetSource(); if (!groupGuy) continue; @@ -1641,7 +1641,7 @@ void WorldSession::HandleCancelMountAuraOpcode(WorldPacket& /*recvData*/) return; } - if (_player->isInFlight()) // not blizz like; no any messages on blizz + if (_player->IsInFlight()) // not blizz like; no any messages on blizz { ChatHandler(this).SendSysMessage(LANG_YOU_IN_FLIGHT); return; @@ -1787,7 +1787,7 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket& recvData) if (!unit) return; - if (!unit->isSpiritService()) // it's not spirit service + if (!unit->IsSpiritService()) // it's not spirit service return; if (bg) @@ -1810,7 +1810,7 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket& recvData) if (!unit) return; - if (!unit->isSpiritService()) // it's not spirit service + if (!unit->IsSpiritService()) // it's not spirit service return; if (bg) @@ -1822,7 +1822,7 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket& recvData) void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recvData*/) { - if (_player->isInFlight()) + if (_player->IsInFlight()) return; if (/*Battlefield* bf = */sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId())) diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 2739e53b818..f45efe0b47e 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -365,7 +365,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket) } // fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map). - if (opcode == MSG_MOVE_FALL_LAND && plrMover && !plrMover->isInFlight()) + if (opcode == MSG_MOVE_FALL_LAND && plrMover && !plrMover->IsInFlight()) plrMover->HandleFall(movementInfo); if (plrMover && ((movementInfo.flags & MOVEMENTFLAG_SWIMMING) != 0) != plrMover->IsInWater()) @@ -406,13 +406,13 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket) // NOTE: this is actually called many times while falling // even after the player has been teleported away /// @todo discard movement packets after the player is rooted - if (plrMover->isAlive()) + if (plrMover->IsAlive()) { plrMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth()); // player can be alive if GM/etc // change the death state to CORPSE to prevent the death timer from // starting in the next player update - if (!plrMover->isAlive()) + if (!plrMover->IsAlive()) plrMover->KillPlayer(); } } @@ -596,7 +596,7 @@ void WorldSession::HandleMoveWaterWalkAck(WorldPacket& recvData) void WorldSession::HandleSummonResponseOpcode(WorldPacket& recvData) { - if (!_player->isAlive() || _player->isInCombat()) + if (!_player->IsAlive() || _player->IsInCombat()) return; uint64 summonerGuid; diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 51533ad8a9f..776643af0a9 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -335,11 +335,11 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket& recvData) //if (GetPlayer()->HasUnitState(UNIT_STATE_DIED)) // GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - if (unit->isArmorer() || unit->isCivilian() || unit->isQuestGiver() || unit->isServiceProvider() || unit->isGuard()) + if (unit->IsArmorer() || unit->IsCivilian() || unit->IsQuestGiver() || unit->IsServiceProvider() || unit->IsGuard()) unit->StopMoving(); // If spiritguide, no need for gossip menu, just put player into resurrect queue - if (unit->isSpiritGuide()) + if (unit->IsSpiritGuide()) { Battleground* bg = _player->GetBattleground(); if (bg) @@ -460,7 +460,7 @@ void WorldSession::HandleBinderActivateOpcode(WorldPacket& recvData) uint64 npcGUID; recvData >> npcGUID; - if (!GetPlayer()->IsInWorld() || !GetPlayer()->isAlive()) + if (!GetPlayer()->IsInWorld() || !GetPlayer()->IsAlive()) return; Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_INNKEEPER); @@ -550,7 +550,7 @@ void WorldSession::SendStablePetCallback(PreparedQueryResult result, uint64 guid uint8 num = 0; // counter for place holder // not let move dead pet in slot - if (pet && pet->isAlive() && pet->getPetType() == HUNTER_PET) + if (pet && pet->IsAlive() && pet->getPetType() == HUNTER_PET) { data << uint32(0); // 4.x unknown, some kind of order? data << uint32(pet->GetCharmInfo()->GetPetNumber()); @@ -597,7 +597,7 @@ void WorldSession::HandleStablePet(WorldPacket& recvData) recvData >> npcGUID; - if (!GetPlayer()->isAlive()) + if (!GetPlayer()->IsAlive()) { SendStableResult(STABLE_ERR_STABLE); return; @@ -616,7 +616,7 @@ void WorldSession::HandleStablePet(WorldPacket& recvData) Pet* pet = _player->GetPet(); // can't place in stable dead pet - if (!pet || !pet->isAlive() || pet->getPetType() != HUNTER_PET) + if (!pet || !pet->IsAlive() || pet->getPetType() != HUNTER_PET) { SendStableResult(STABLE_ERR_STABLE); return; @@ -713,10 +713,10 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32 } CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(petEntry); - if (!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets())) + if (!creatureInfo || !creatureInfo->IsTameable(_player->CanTameExoticPets())) { // if problem in exotic pet - if (creatureInfo && creatureInfo->isTameable(true)) + if (creatureInfo && creatureInfo->IsTameable(true)) SendStableResult(STABLE_ERR_EXOTIC); else SendStableResult(STABLE_ERR_STABLE); @@ -724,7 +724,7 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32 } Pet* pet = _player->GetPet(); - if (pet && pet->isAlive()) + if (pet && pet->IsAlive()) { SendStableResult(STABLE_ERR_STABLE); return; @@ -844,10 +844,10 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3 } CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(petEntry); - if (!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets())) + if (!creatureInfo || !creatureInfo->IsTameable(_player->CanTameExoticPets())) { // if problem in exotic pet - if (creatureInfo && creatureInfo->isTameable(true)) + if (creatureInfo && creatureInfo->IsTameable(true)) SendStableResult(STABLE_ERR_EXOTIC); else SendStableResult(STABLE_ERR_STABLE); @@ -863,7 +863,7 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3 } // move alive pet to slot or delete dead pet - _player->RemovePet(pet, pet->isAlive() ? PetSaveMode(slot) : PET_SAVE_AS_DELETED); + _player->RemovePet(pet, pet->IsAlive() ? PetSaveMode(slot) : PET_SAVE_AS_DELETED); // summon unstabled pet Pet* newPet = new Pet(_player); diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index c26c0ce7c01..ae18eece9a9 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -51,7 +51,7 @@ void WorldSession::HandleDismissCritter(WorldPacket& recvData) if (_player->GetCritterGUID() == pet->GetGUID()) { - if (pet->GetTypeId() == TYPEID_UNIT && pet->ToCreature()->isSummon()) + if (pet->GetTypeId() == TYPEID_UNIT && pet->ToCreature()->IsSummon()) pet->ToTempSummon()->UnSummon(); } } @@ -89,7 +89,7 @@ void WorldSession::HandlePetAction(WorldPacket& recvData) return; } - if (!pet->isAlive()) + if (!pet->IsAlive()) { SpellInfo const* spell = (flag == ACT_ENABLED || flag == ACT_PASSIVE) ? sSpellMgr->GetSpellInfo(spellid) : NULL; if (!spell) @@ -109,7 +109,7 @@ void WorldSession::HandlePetAction(WorldPacket& recvData) //If a pet is dismissed, m_Controlled will change std::vector<Unit*> controlled; for (Unit::ControlList::iterator itr = GetPlayer()->m_Controlled.begin(); itr != GetPlayer()->m_Controlled.end(); ++itr) - if ((*itr)->GetEntry() == pet->GetEntry() && (*itr)->isAlive()) + if ((*itr)->GetEntry() == pet->GetEntry() && (*itr)->IsAlive()) controlled.push_back(*itr); for (std::vector<Unit*>::iterator itr = controlled.begin(); itr != controlled.end(); ++itr) HandlePetActionHelper(*itr, guid1, spellid, flag, guid2, x, y, z); @@ -138,7 +138,7 @@ void WorldSession::HandlePetStopAttack(WorldPacket &recvData) return; } - if (!pet->isAlive()) + if (!pet->IsAlive()) return; pet->AttackStop(); @@ -205,9 +205,9 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid pet->ClearUnitState(UNIT_STATE_FOLLOW); // This is true if pet has no target or has target but targets differs. - if (pet->getVictim() != TargetUnit || (pet->getVictim() == TargetUnit && !pet->GetCharmInfo()->IsCommandAttack())) + if (pet->GetVictim() != TargetUnit || (pet->GetVictim() == TargetUnit && !pet->GetCharmInfo()->IsCommandAttack())) { - if (pet->getVictim()) + if (pet->GetVictim()) pet->AttackStop(); if (pet->GetTypeId() != TYPEID_PLAYER && pet->ToCreature()->IsAIEnabled) @@ -221,7 +221,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid pet->ToCreature()->AI()->AttackStart(TargetUnit); //10% chance to play special pet attack talk, else growl - if (pet->ToCreature()->isPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && urand(0, 100) < 10) + if (pet->ToCreature()->IsPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && urand(0, 100) < 10) pet->SendPetTalk((uint32)PET_TALK_ATTACK); else { @@ -231,7 +231,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid } else // charmed player { - if (pet->getVictim() && pet->getVictim() != TargetUnit) + if (pet->GetVictim() && pet->GetVictim() != TargetUnit) pet->AttackStop(); charmInfo->SetIsCommandAttack(true); @@ -252,7 +252,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid else if (pet->GetOwnerGUID() == GetPlayer()->GetGUID()) { ASSERT(pet->GetTypeId() == TYPEID_UNIT); - if (pet->isPet()) + if (pet->IsPet()) { if (((Pet*)pet)->getPetType() == HUNTER_PET) GetPlayer()->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED); @@ -371,7 +371,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid //10% chance to play special pet attack talk, else growl //actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell - if (pet->ToCreature()->isPet() && (((Pet*)pet)->getPetType() == SUMMON_PET) && (pet != unit_target) && (urand(0, 100) < 10)) + if (pet->ToCreature()->IsPet() && (((Pet*)pet)->getPetType() == SUMMON_PET) && (pet != unit_target) && (urand(0, 100) < 10)) pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL); else { @@ -381,9 +381,9 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid if (unit_target && !GetPlayer()->IsFriendlyTo(unit_target) && !pet->isPossessed() && !pet->IsVehicle()) { // This is true if pet has no target or has target but targets differs. - if (pet->getVictim() != unit_target) + if (pet->GetVictim() != unit_target) { - if (pet->getVictim()) + if (pet->GetVictim()) pet->AttackStop(); pet->GetMotionMaster()->Clear(); if (pet->ToCreature()->IsAIEnabled) @@ -449,7 +449,7 @@ void WorldSession::SendPetNameQuery(uint64 petguid, uint32 petnumber) data << pet->GetName(); data << uint32(pet->GetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP)); - if (pet->isPet() && ((Pet*)pet)->GetDeclinedNames()) + if (pet->IsPet() && ((Pet*)pet)->GetDeclinedNames()) { data << uint8(1); for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) @@ -466,7 +466,7 @@ bool WorldSession::CheckStableMaster(uint64 guid) // spell case or GM if (guid == GetPlayer()->GetGUID()) { - if (!GetPlayer()->isGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE)) + if (!GetPlayer()->IsGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE)) { TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "Player (GUID:%u) attempt open stable in cheating way.", GUID_LOPART(guid)); return false; @@ -577,7 +577,7 @@ void WorldSession::HandlePetSetAction(WorldPacket& recvData) //sign for autocast if (act_state == ACT_ENABLED) { - if (pet->GetTypeId() == TYPEID_UNIT && pet->ToCreature()->isPet()) + if (pet->GetTypeId() == TYPEID_UNIT && pet->ToCreature()->IsPet()) ((Pet*)pet)->ToggleAutocast(spellInfo, true); else for (Unit::ControlList::iterator itr = GetPlayer()->m_Controlled.begin(); itr != GetPlayer()->m_Controlled.end(); ++itr) @@ -587,7 +587,7 @@ void WorldSession::HandlePetSetAction(WorldPacket& recvData) //sign for no/turn off autocast else if (act_state == ACT_DISABLED) { - if (pet->GetTypeId() == TYPEID_UNIT && pet->ToCreature()->isPet()) + if (pet->GetTypeId() == TYPEID_UNIT && pet->ToCreature()->IsPet()) ((Pet*)pet)->ToggleAutocast(spellInfo, false); else for (Unit::ControlList::iterator itr = GetPlayer()->m_Controlled.begin(); itr != GetPlayer()->m_Controlled.end(); ++itr) @@ -617,7 +617,7 @@ void WorldSession::HandlePetRename(WorldPacket& recvData) Pet* pet = ObjectAccessor::FindPet(petguid); // check it! - if (!pet || !pet->isPet() || ((Pet*)pet)->getPetType()!= HUNTER_PET || + if (!pet || !pet->IsPet() || ((Pet*)pet)->getPetType()!= HUNTER_PET || !pet->HasByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED) || pet->GetOwnerGUID() != _player->GetGUID() || !pet->GetCharmInfo()) return; @@ -699,7 +699,7 @@ void WorldSession::HandlePetAbandon(WorldPacket& recvData) Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); if (pet) { - if (pet->isPet()) + if (pet->IsPet()) _player->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED); else if (pet->GetGUID() == _player->GetCharmGUID()) _player->StopCastingCharm(); @@ -740,7 +740,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) return; } - if (pet->isPet()) + if (pet->IsPet()) ((Pet*)pet)->ToggleAutocast(spellInfo, state); else pet->GetCharmInfo()->ToggleCreatureAutocast(spellInfo, state); @@ -813,7 +813,7 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) { Creature* pet = caster->ToCreature(); pet->AddCreatureSpellCooldown(spellId); - if (pet->isPet()) + if (pet->IsPet()) { Pet* p = (Pet*)pet; // 10% chance to play special pet attack talk, else growl diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 2d551d03f45..00de2225912 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -98,7 +98,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) uint32 charterid = 0; uint32 cost = 0; uint32 type = 0; - if (creature->isTabardDesigner()) + if (creature->IsTabardDesigner()) { // if tabard designer, then trying to buy a guild charter. // do not let if already in guild. @@ -937,7 +937,7 @@ void WorldSession::SendPetitionShowList(uint64 guid) WorldPacket data(SMSG_PETITION_SHOWLIST, 8+1+4*6); data << guid; // npc guid - if (creature->isTabardDesigner()) + if (creature->IsTabardDesigner()) { data << uint8(1); // count data << uint32(1); // index diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 279c1392e17..12644ad2751 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -163,7 +163,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player || player == _player) // not self continue; @@ -569,7 +569,7 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player || player == _player) // skip self continue; diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 69e643eb00b..8fa99899296 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -149,7 +149,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) return; } - if (pUser->isInCombat()) + if (pUser->IsInCombat()) { for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) { @@ -510,7 +510,7 @@ void WorldSession::HandlePetCancelAuraOpcode(WorldPacket& recvPacket) return; } - if (!pet->isAlive()) + if (!pet->IsAlive()) { pet->SendPetActionFeedback(FEEDBACK_PET_DEAD); return; @@ -563,7 +563,7 @@ void WorldSession::HandleTotemDestroyed(WorldPacket& recvPacket) return; Creature* totem = GetPlayer()->GetMap()->GetCreature(_player->m_SummonSlot[slotId]); - if (totem && totem->isTotem() && totem->GetGUID() == guid) + if (totem && totem->IsTotem() && totem->GetGUID() == guid) totem->ToTotem()->UnSummon(); } diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 82804fe40fc..043280c842f 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -646,7 +646,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) if (GetPlayer()->m_trade) return; - if (!GetPlayer()->isAlive()) + if (!GetPlayer()->IsAlive()) { SendTradeStatus(TRADE_STATUS_YOU_DEAD); return; @@ -664,7 +664,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (GetPlayer()->isInFlight()) + if (GetPlayer()->IsInFlight()) { SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR); return; @@ -690,13 +690,13 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (!pOther->isAlive()) + if (!pOther->IsAlive()) { SendTradeStatus(TRADE_STATUS_TARGET_DEAD); return; } - if (pOther->isInFlight()) + if (pOther->IsInFlight()) { SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR); return; diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 46bd523f9f2..447dc5c3e5a 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -91,15 +91,15 @@ void InstanceScript::UpdateMinionState(Creature* minion, EncounterState state) switch (state) { case NOT_STARTED: - if (!minion->isAlive()) + if (!minion->IsAlive()) minion->Respawn(); - else if (minion->isInCombat()) + else if (minion->IsInCombat()) minion->AI()->EnterEvadeMode(); break; case IN_PROGRESS: - if (!minion->isAlive()) + if (!minion->IsAlive()) minion->Respawn(); - else if (!minion->getVictim()) + else if (!minion->GetVictim()) minion->AI()->DoZoneInCombat(); break; default: @@ -210,7 +210,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) if (state == DONE) for (MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) - if ((*i)->isWorldBoss() && (*i)->isAlive()) + if ((*i)->isWorldBoss() && (*i)->IsAlive()) return false; bossInfo->state = state; @@ -297,7 +297,7 @@ void InstanceScript::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData) if (!lPlayers.isEmpty()) { for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->SendUpdateWorldState(uiStateId, uiStateData); } else @@ -317,7 +317,7 @@ void InstanceScript::DoSendNotifyToInstance(char const* format, ...) vsnprintf(buff, 1024, format, ap); va_end(ap); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) if (WorldSession* session = player->GetSession()) session->SendNotification("%s", buff); } @@ -330,7 +330,7 @@ void InstanceScript::DoUpdateAchievementCriteria(AchievementCriteriaTypes type, if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->UpdateAchievementCriteria(type, miscValue1, miscValue2, 0, unit); } @@ -341,7 +341,7 @@ void InstanceScript::DoStartTimedAchievement(AchievementCriteriaTimedTypes type, if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->StartTimedAchievement(type, entry); } @@ -352,7 +352,7 @@ void InstanceScript::DoStopTimedAchievement(AchievementCriteriaTimedTypes type, if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->RemoveTimedAchievement(type, entry); } @@ -364,7 +364,7 @@ void InstanceScript::DoRemoveAurasDueToSpellOnPlayers(uint32 spell) { for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { player->RemoveAurasDueToSpell(spell); if (Pet* pet = player->GetPet()) @@ -381,7 +381,7 @@ void InstanceScript::DoCastSpellOnPlayers(uint32 spell) if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->CastSpell(player, spell, true); } @@ -456,7 +456,7 @@ void InstanceScript::UpdateEncounterState(EncounterCreditType type, uint32 credi Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) if (Group* grp = player->GetGroup()) if (grp->isLFGGroup()) { @@ -474,6 +474,6 @@ void InstanceScript::UpdatePhasing() Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->GetPhaseMgr().NotifyConditionChanged(phaseUdateData); } diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 7da7cd975ee..ef914cc29ee 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -465,7 +465,7 @@ bool Loot::FillLoot(uint32 lootId, LootStore const& store, Player* lootOwner, bo roundRobinPlayer = lootOwner->GetGUID(); for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* player = itr->getSource()) // should actually be looted object instead of lootOwner but looter has to be really close so doesnt really matter + if (Player* player = itr->GetSource()) // should actually be looted object instead of lootOwner but looter has to be really close so doesnt really matter FillNotNormalLootFor(player, player->IsAtGroupRewardDistance(lootOwner)); for (uint8 i = 0; i < items.size(); ++i) diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 2526364cef6..2fa0a03e63f 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -69,7 +69,7 @@ MailSender::MailSender(AuctionEntry* sender) MailSender::MailSender(Player* sender) { m_messageType = MAIL_NORMAL; - m_stationery = sender->isGameMaster() ? MAIL_STATIONERY_GM : MAIL_STATIONERY_DEFAULT; + m_stationery = sender->IsGameMaster() ? MAIL_STATIONERY_GM : MAIL_STATIONERY_DEFAULT; m_senderId = sender->GetGUIDLow(); } @@ -200,7 +200,7 @@ void MailDraft::SendMailTo(SQLTransaction& trans, MailReceiver const& receiver, if (m_COD) expire_delay = 3 * DAY; else - expire_delay = pSender && pSender->isGameMaster() ? 90 * DAY : 30 * DAY; + expire_delay = pSender && pSender->IsGameMaster() ? 90 * DAY : 30 * DAY; time_t expire_time = deliver_time + expire_delay; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 90e072825de..fb0f6d0c461 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -520,7 +520,7 @@ void Map::Update(const uint32 t_diff) /// update worldsessions for existing players for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) { - Player* player = m_mapRefIter->getSource(); + Player* player = m_mapRefIter->GetSource(); if (player && player->IsInWorld()) { //player->Update(t_diff); @@ -542,7 +542,7 @@ void Map::Update(const uint32 t_diff) // to make sure calls to Map::Remove don't invalidate it for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) { - Player* player = m_mapRefIter->getSource(); + Player* player = m_mapRefIter->GetSource(); if (!player || !player->IsInWorld()) continue; @@ -586,7 +586,7 @@ struct ResetNotifier template<class T>inline void resetNotify(GridRefManager<T> &m) { for (typename GridRefManager<T>::iterator iter=m.begin(); iter != m.end(); ++iter) - iter->getSource()->ResetAllNotifies(); + iter->GetSource()->ResetAllNotifies(); } template<class T> void Visit(GridRefManager<T> &) {} void Visit(CreatureMapType &m) { resetNotify<Creature>(m);} @@ -597,7 +597,7 @@ void Map::ProcessRelocationNotifies(const uint32 diff) { for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); ++i) { - NGridType *grid = i->getSource(); + NGridType *grid = i->GetSource(); if (grid->GetGridState() != GRID_STATE_ACTIVE) continue; @@ -637,7 +637,7 @@ void Map::ProcessRelocationNotifies(const uint32 diff) TypeContainerVisitor<ResetNotifier, WorldTypeMapContainer > world_notifier(reset); for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); ++i) { - NGridType *grid = i->getSource(); + NGridType *grid = i->GetSource(); if (grid->GetGridState() != GRID_STATE_ACTIVE) continue; @@ -839,7 +839,7 @@ void Map::MoveAllCreaturesInMoveList() //But this check is always needed to ensure safety /// @todo pets will disappear if this is outside CreatureRespawnRelocation //need to check why pet is frequently relocated to an unloaded cell - if (c->isPet()) + if (c->IsPet()) ((Pet*)c)->Remove(PET_SAVE_NOT_IN_SLOT, true); else AddObjectToRemoveList(c); @@ -1024,7 +1024,7 @@ void Map::RemoveAllPlayers() { for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player->IsBeingTeleportedFar()) { // this is happening for bg @@ -1042,7 +1042,7 @@ void Map::UnloadAll() for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end();) { - NGridType &grid(*i->getSource()); + NGridType &grid(*i->GetSource()); ++i; UnloadGrid(grid, true); // deletes the grid and removes it from the GridRefManager } @@ -2090,8 +2090,8 @@ void Map::DelayedUpdate(const uint32 t_diff) { for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end();) { - NGridType *grid = i->getSource(); - GridInfo* info = i->getSource()->getGridInfoRef(); + NGridType *grid = i->GetSource(); + GridInfo* info = i->GetSource()->getGridInfoRef(); ++i; // The update might delete the map and we need the next map before the iterator gets invalid ASSERT(grid->GetGridState() >= 0 && grid->GetGridState() < MAX_GRID_STATE); si_GridStates[grid->GetGridState()]->Update(*this, *grid, *info, t_diff); @@ -2182,7 +2182,7 @@ uint32 Map::GetPlayersCountExceptGMs() const { uint32 count = 0; for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - if (!itr->getSource()->isGameMaster()) + if (!itr->GetSource()->IsGameMaster()) ++count; return count; } @@ -2190,7 +2190,7 @@ uint32 Map::GetPlayersCountExceptGMs() const void Map::SendToPlayers(WorldPacket const* data) const { for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - itr->getSource()->GetSession()->SendPacket(data); + itr->GetSource()->GetSession()->SendPacket(data); } bool Map::ActiveObjectsNearGrid(NGridType const& ngrid) const @@ -2209,7 +2209,7 @@ bool Map::ActiveObjectsNearGrid(NGridType const& ngrid) const for (MapRefManager::const_iterator iter = m_mapRefManager.begin(); iter != m_mapRefManager.end(); ++iter) { - Player* player = iter->getSource(); + Player* player = iter->GetSource(); CellCoord p = Trinity::ComputeCellCoord(player->GetPositionX(), player->GetPositionY()); if ((cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) && @@ -2235,7 +2235,7 @@ void Map::AddToActive(Creature* c) AddToActiveHelper(c); // also not allow unloading spawn grid to prevent creating creature clone at load - if (!c->isPet() && c->GetDBTableGUIDLow()) + if (!c->IsPet() && c->GetDBTableGUIDLow()) { float x, y, z; c->GetRespawnPosition(x, y, z); @@ -2256,7 +2256,7 @@ void Map::RemoveFromActive(Creature* c) RemoveFromActiveHelper(c); // also allow unloading spawn grid - if (!c->isPet() && c->GetDBTableGUIDLow()) + if (!c->IsPet() && c->GetDBTableGUIDLow()) { float x, y, z; c->GetRespawnPosition(x, y, z); @@ -2325,7 +2325,7 @@ bool InstanceMap::CanEnter(Player* player) } // allow GM's to enter - if (player->isGameMaster()) + if (player->IsGameMaster()) return Map::CanEnter(player); // cannot enter if the instance is full (player cap), GMs don't count @@ -2339,7 +2339,7 @@ bool InstanceMap::CanEnter(Player* player) // cannot enter while an encounter is in progress on raids /*Group* group = player->GetGroup(); - if (!player->isGameMaster() && group && group->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ + if (!player->IsGameMaster() && group && group->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ if (IsRaid() && GetInstanceScript() && GetInstanceScript()->IsEncounterInProgress()) { player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); @@ -2353,9 +2353,9 @@ bool InstanceMap::CanEnter(Player* player) if (!playerList.isEmpty()) for (PlayerList::const_iterator i = playerList.begin(); i != playerList.end(); ++i) - if (Player* iPlayer = i->getSource()) + if (Player* iPlayer = i->GetSource()) { - if (iPlayer->isGameMaster()) // bypass GMs + if (iPlayer->IsGameMaster()) // bypass GMs continue; if (!player->GetGroup()) // player has not group and there is someone inside, deny entry { @@ -2568,14 +2568,14 @@ bool InstanceMap::Reset(uint8 method) { // notify the players to leave the instance so it can be reset for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - itr->getSource()->SendResetFailedNotify(GetId()); + itr->GetSource()->SendResetFailedNotify(GetId()); } else { if (method == INSTANCE_RESET_GLOBAL) // set the homebind timer for players inside (1 minute) for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - itr->getSource()->m_InstanceValid = false; + itr->GetSource()->m_InstanceValid = false; // the unload timer is not started // instead the map will unload immediately after the players have left @@ -2609,7 +2609,7 @@ void InstanceMap::PermBindAllPlayers(Player* source) // group members outside the instance group don't get bound for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); // players inside an instance cannot be bound to other instances // some players may already be permanently bound, in this case nothing happens InstancePlayerBind* bind = player->GetBoundInstance(save->GetMapId(), save->GetDifficulty()); @@ -2642,7 +2642,7 @@ void InstanceMap::UnloadAll() void InstanceMap::SendResetWarnings(uint32 timeLeft) const { for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - itr->getSource()->SendInstanceResetWarning(GetId(), itr->getSource()->GetDifficulty(IsRaid()), timeLeft); + itr->GetSource()->SendInstanceResetWarning(GetId(), itr->GetSource()->GetDifficulty(IsRaid()), timeLeft); } void InstanceMap::SetResetSchedule(bool on) @@ -2758,7 +2758,7 @@ void BattlegroundMap::RemoveAllPlayers() { if (HavePlayers()) for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (!player->IsBeingTeleportedFar()) player->TeleportTo(player->GetBattlegroundEntryPoint()); } diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 538285edd0f..ccf2e5321ce 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -183,7 +183,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) // FIXME: mapDiff is never used //Bypass checks for GMs - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; char const* mapName = entry->name; @@ -202,7 +202,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) } } - if (!player->isAlive()) + if (!player->IsAlive()) { if (Corpse* corpse = player->GetCorpse()) { diff --git a/src/server/game/Maps/PhaseMgr.cpp b/src/server/game/Maps/PhaseMgr.cpp index a7393dfba7f..0314a9605ba 100644 --- a/src/server/game/Maps/PhaseMgr.cpp +++ b/src/server/game/Maps/PhaseMgr.cpp @@ -225,7 +225,7 @@ void PhaseMgr::SetCustomPhase(uint32 phaseMask) uint32 PhaseData::GetCurrentPhasemask() const { - if (player->isGameMaster()) + if (player->IsGameMaster()) return uint32(PHASEMASK_ANYWHERE); if (_CustomPhasemask) diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 39a478f158e..74a988acf70 100644 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -166,7 +166,7 @@ namespace Trinity uint32 gain; if (u->GetTypeId() == TYPEID_UNIT && - (((Creature*)u)->isTotem() || ((Creature*)u)->isPet() || + (((Creature*)u)->IsTotem() || ((Creature*)u)->IsPet() || (((Creature*)u)->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) || ((Creature*)u)->GetCreatureTemplate()->type == CREATURE_TYPE_CRITTER)) gain = 0; diff --git a/src/server/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp index 30797bbaaca..84c6c266cea 100644 --- a/src/server/game/Movement/FollowerReference.cpp +++ b/src/server/game/Movement/FollowerReference.cpp @@ -32,5 +32,5 @@ void FollowerReference::targetObjectDestroyLink() void FollowerReference::sourceObjectDestroyLink() { - getSource()->stopFollowing(); + GetSource()->stopFollowing(); } diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 72537f0898c..ef24b112253 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -37,7 +37,7 @@ void ConfusedMovementGenerator<T>::DoInitialize(T* unit) unit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED); unit->GetPosition(i_x, i_y, i_z); - if (!unit->isAlive() || unit->IsStopped()) + if (!unit->IsAlive() || unit->IsStopped()) return; unit->StopMoving(); @@ -49,7 +49,7 @@ void ConfusedMovementGenerator<T>::DoReset(T* unit) { i_nextMoveTime.Reset(0); - if (!unit->isAlive() || unit->IsStopped()) + if (!unit->IsAlive() || unit->IsStopped()) return; unit->StopMoving(); @@ -117,8 +117,8 @@ void ConfusedMovementGenerator<Creature>::DoFinalize(Creature* unit) { unit->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED); unit->ClearUnitState(UNIT_STATE_CONFUSED | UNIT_STATE_CONFUSED_MOVE); - if (unit->getVictim()) - unit->SetTarget(unit->getVictim()->GetGUID()); + if (unit->GetVictim()) + unit->SetTarget(unit->GetVictim()->GetGUID()); } template void ConfusedMovementGenerator<Player>::DoInitialize(Player*); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 216fffbfee1..f78411fc547 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -125,8 +125,8 @@ void FleeingMovementGenerator<Creature>::DoFinalize(Creature* owner) { owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); owner->ClearUnitState(UNIT_STATE_FLEEING|UNIT_STATE_FLEEING_MOVE); - if (owner->getVictim()) - owner->SetTarget(owner->getVictim()->GetGUID()); + if (owner->GetVictim()) + owner->SetTarget(owner->GetVictim()->GetGUID()); } template<class T> @@ -138,7 +138,7 @@ void FleeingMovementGenerator<T>::DoReset(T* owner) template<class T> bool FleeingMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff) { - if (!owner || !owner->isAlive()) + if (!owner || !owner->IsAlive()) return false; if (owner->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED)) @@ -169,9 +169,9 @@ void TimedFleeingMovementGenerator::Finalize(Unit* owner) { owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); owner->ClearUnitState(UNIT_STATE_FLEEING|UNIT_STATE_FLEEING_MOVE); - if (Unit* victim = owner->getVictim()) + if (Unit* victim = owner->GetVictim()) { - if (owner->isAlive()) + if (owner->IsAlive()) { owner->AttackStop(); owner->ToCreature()->AI()->AttackStart(victim); @@ -181,7 +181,7 @@ void TimedFleeingMovementGenerator::Finalize(Unit* owner) bool TimedFleeingMovementGenerator::Update(Unit* owner, uint32 time_diff) { - if (!owner->isAlive()) + if (!owner->IsAlive()) return false; if (owner->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED)) diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp index 2c3d5b3bf61..49cf797761a 100755 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp @@ -41,8 +41,8 @@ void RotateMovementGenerator::Initialize(Unit* owner) if (!owner->IsStopped()) owner->StopMoving(); - if (owner->getVictim()) - owner->SetInFront(owner->getVictim()); + if (owner->GetVictim()) + owner->SetInFront(owner->GetVictim()); owner->AddUnitState(UNIT_STATE_ROTATING); owner->AttackStop(); diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 186723a1c43..917872c5960 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -125,7 +125,7 @@ void AssistanceMovementGenerator::Finalize(Unit* unit) { unit->ToCreature()->SetNoCallAssistance(false); unit->ToCreature()->CallAssistance(); - if (unit->isAlive()) + if (unit->IsAlive()) unit->GetMotionMaster()->MoveSeekAssistanceDistract(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY)); } @@ -140,9 +140,9 @@ void EffectMovementGenerator::Finalize(Unit* unit) return; // Need restore previous movement since we have no proper states system - if (unit->isAlive() && !unit->HasUnitState(UNIT_STATE_CONFUSED | UNIT_STATE_FLEEING)) + if (unit->IsAlive() && !unit->HasUnitState(UNIT_STATE_CONFUSED | UNIT_STATE_FLEEING)) { - if (Unit* victim = unit->getVictim()) + if (Unit* victim = unit->GetVictim()) unit->GetMotionMaster()->MoveChase(victim); else unit->GetMotionMaster()->Initialize(); diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 723b0748494..24fd38a3a8f 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -116,7 +116,7 @@ void RandomMovementGenerator<Creature>::_setRandomLocation(Creature* creature) template<> void RandomMovementGenerator<Creature>::DoInitialize(Creature* creature) { - if (!creature->isAlive()) + if (!creature->IsAlive()) return; if (!wander_distance) diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 8086e60c912..f457443dc8c 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -58,7 +58,7 @@ void TargetedMovementGeneratorMedium<T, D>::_setTargetLocation(T* owner, bool up // be (GetCombatReach() + i_offset) away. // Only applies when i_target is pet's owner otherwise pets and mobs end up // doing a "dance" while fighting - if (owner->isPet() && i_target->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPet() && i_target->GetTypeId() == TYPEID_PLAYER) { dist = i_target->GetCombatReach(); size = i_target->GetCombatReach() - i_target->GetObjectSize(); @@ -89,7 +89,7 @@ void TargetedMovementGeneratorMedium<T, D>::_setTargetLocation(T* owner, bool up i_path = new PathGenerator(owner); // allow pets to use shortcut if no path found when following their master - bool forceDest = (owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature()->isPet() + bool forceDest = (owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature()->IsPet() && owner->HasUnitState(UNIT_STATE_FOLLOW)); bool result = i_path->CalculatePath(x, y, z, forceDest); @@ -122,7 +122,7 @@ bool TargetedMovementGeneratorMedium<T, D>::DoUpdate(T* owner, uint32 time_diff) if (!i_target.isValid() || !i_target->IsInWorld()) return false; - if (!owner || !owner->isAlive()) + if (!owner || !owner->IsAlive()) return false; if (owner->HasUnitState(UNIT_STATE_NOT_MOVE)) @@ -252,7 +252,7 @@ void FollowMovementGenerator<Creature>::_updateSpeed(Creature* owner) { // pet only sync speed with owner /// Make sure we are not in the process of a map change (IsInWorld) - if (!owner->isPet() || !owner->IsInWorld() || !i_target.isValid() || i_target->GetGUID() != owner->GetOwnerGUID()) + if (!owner->IsPet() || !owner->IsInWorld() || !i_target.isValid() || i_target->GetGUID() != owner->GetOwnerGUID()) return; owner->UpdateSpeed(MOVE_RUN, true); diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 3edeb348d54..14d0ab0ec66 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -83,7 +83,7 @@ class ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMo static void _clearUnitStateMove(T* u) { u->ClearUnitState(UNIT_STATE_CHASE_MOVE); } static void _addUnitStateMove(T* u) { u->AddUnitState(UNIT_STATE_CHASE_MOVE); } bool EnableWalking() const { return false;} - bool _lostTarget(T* u) const { return u->getVictim() != this->GetTarget(); } + bool _lostTarget(T* u) const { return u->GetVictim() != this->GetTarget(); } void _reachTarget(T*); }; diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index 3fd7e7ee393..6ef93402606 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -172,7 +172,7 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con BuildShortcut(); bool path = _sourceUnit->GetTypeId() == TYPEID_UNIT && _sourceUnit->ToCreature()->CanFly(); - bool waterPath = _sourceUnit->GetTypeId() == TYPEID_UNIT && _sourceUnit->ToCreature()->canSwim(); + bool waterPath = _sourceUnit->GetTypeId() == TYPEID_UNIT && _sourceUnit->ToCreature()->CanSwim(); if (waterPath) { // Check both start and end points, if they're both in water, then we can *safely* let the creature move @@ -207,7 +207,7 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con if (_sourceUnit->GetBaseMap()->IsUnderWater(p.x, p.y, p.z)) { TC_LOG_DEBUG(LOG_FILTER_MAPS, "++ BuildPolyPath :: underWater case\n"); - if (owner->canSwim()) + if (owner->CanSwim()) buildShotrcut = true; } else @@ -511,11 +511,11 @@ void PathGenerator::CreateFilter() if (_sourceUnit->GetTypeId() == TYPEID_UNIT) { Creature* creature = (Creature*)_sourceUnit; - if (creature->canWalk()) + if (creature->CanWalk()) includeFlags |= NAV_GROUND; // walk // creatures don't take environmental damage - if (creature->canSwim()) + if (creature->CanSwim()) includeFlags |= (NAV_WATER | NAV_MAGMA | NAV_SLIME); // swim } else // assume Player diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 6cc26483320..30308c12630 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -441,7 +441,7 @@ void OutdoorPvP::HandleKill(Player* killer, Unit* killed) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* groupGuy = itr->getSource(); + Player* groupGuy = itr->GetSource(); if (!groupGuy) continue; diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index bb791cd3810..c37cdf80730 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -579,7 +579,7 @@ void Map::ScriptsProcess() } // quest id and flags checked at script loading - if ((worldObject->GetTypeId() != TYPEID_UNIT || ((Unit*)worldObject)->isAlive()) && + if ((worldObject->GetTypeId() != TYPEID_UNIT || ((Unit*)worldObject)->IsAlive()) && (step.script->QuestExplored.Distance == 0 || worldObject->IsWithinDistInMap(player, float(step.script->QuestExplored.Distance)))) player->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID); else diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index fc624b93448..42cf9803ab3 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -489,7 +489,7 @@ void WorldSession::LogoutPlayer(bool save) bg->EventPlayerLoggedOut(_player); ///- Teleport to home if the player is in an invalid instance - if (!_player->m_InstanceValid && !_player->isGameMaster()) + if (!_player->m_InstanceValid && !_player->IsGameMaster()) _player->TeleportTo(_player->m_homebindMapId, _player->m_homebindX, _player->m_homebindY, _player->m_homebindZ, _player->GetOrientation()); sOutdoorPvPMgr->HandlePlayerLeaveZone(_player, _player->GetZoneId()); diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index f0f2f787e60..66ad6fc190a 100644 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -112,7 +112,7 @@ void LoadSkillExtraItemTable() TC_LOG_INFO(LOG_FILTER_SERVER_LOADING, ">> Loaded %u spell specialization definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); } -bool canCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax) +bool CanCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax) { // get the info for the specified spell SkillExtraItemMap::const_iterator ret = SkillExtraItemStore.find(spellId); diff --git a/src/server/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h index fd73cdbeab6..507d513dd02 100644 --- a/src/server/game/Skills/SkillExtraItems.h +++ b/src/server/game/Skills/SkillExtraItems.h @@ -24,7 +24,7 @@ // predef classes used in functions class Player; // returns true and sets the appropriate info if the player can create extra items with the given spellId -bool canCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax); +bool CanCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax); // function to load the extra item creation info from DB void LoadSkillExtraItemTable(); #endif diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 6b2e67df095..faaedf42b74 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1588,7 +1588,7 @@ void AuraEffect::HandleSpiritOfRedemption(AuraApplication const* aurApp, uint8 m target->SetHealth(1); } // die at aura end - else if (target->isAlive()) + else if (target->IsAlive()) // call functions which may have additional effects after chainging state of unit target->setDeathState(JUST_DIED); } @@ -2787,11 +2787,11 @@ void AuraEffect::HandleAuraModTotalThreat(AuraApplication const* aurApp, uint8 m Unit* target = aurApp->GetTarget(); - if (!target->isAlive() || target->GetTypeId() != TYPEID_PLAYER) + if (!target->IsAlive() || target->GetTypeId() != TYPEID_PLAYER) return; Unit* caster = GetCaster(); - if (caster && caster->isAlive()) + if (caster && caster->IsAlive()) target->getHostileRefManager().addTempThreat((float)GetAmount(), apply); } @@ -2802,11 +2802,11 @@ void AuraEffect::HandleModTaunt(AuraApplication const* aurApp, uint8 mode, bool Unit* target = aurApp->GetTarget(); - if (!target->isAlive() || !target->CanHaveThreatList()) + if (!target->IsAlive() || !target->CanHaveThreatList()) return; Unit* caster = GetCaster(); - if (!caster || !caster->isAlive()) + if (!caster || !caster->IsAlive()) return; if (apply) @@ -2915,7 +2915,7 @@ void AuraEffect::HandleModPossessPet(AuraApplication const* aurApp, uint8 mode, // return; Unit* target = aurApp->GetTarget(); - if (target->GetTypeId() != TYPEID_UNIT || !target->ToCreature()->isPet()) + if (target->GetTypeId() != TYPEID_UNIT || !target->ToCreature()->IsPet()) return; Pet* pet = target->ToPet(); @@ -2944,7 +2944,7 @@ void AuraEffect::HandleModPossessPet(AuraApplication const* aurApp, uint8 mode, // Follow owner only if not fighting or owner didn't click "stay" at new location // This may be confusing because pet bar shows "stay" when under the spell but it retains // the "follow" flag. Player MUST click "stay" while under the spell. - if (!pet->getVictim() && !pet->GetCharmInfo()->HasCommandState(COMMAND_STAY)) + if (!pet->GetVictim() && !pet->GetCharmInfo()->HasCommandState(COMMAND_STAY)) { pet->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, pet->GetFollowAngle()); } @@ -3589,7 +3589,7 @@ void AuraEffect::HandleAuraModResistance(AuraApplication const* aurApp, uint8 mo if (GetMiscValue() & int32(1<<x)) { target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), TOTAL_VALUE, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) + if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->IsPet()) target->ApplyResistanceBuffModsMod(SpellSchools(x), GetAmount() > 0, (float)GetAmount(), apply); } } @@ -3606,7 +3606,7 @@ void AuraEffect::HandleAuraModBaseResistancePCT(AuraApplication const* aurApp, u if (target->GetTypeId() != TYPEID_PLAYER) { //pets only have base armor - if (target->ToCreature()->isPet() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) + if (target->ToCreature()->IsPet() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) target->HandleStatModifier(UNIT_MOD_ARMOR, BASE_PCT, float(GetAmount()), apply); } else @@ -3631,7 +3631,7 @@ void AuraEffect::HandleModResistancePercent(AuraApplication const* aurApp, uint8 if (GetMiscValue() & int32(1<<i)) { target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_PCT, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) + if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->IsPet()) { target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), true, (float)GetAmount(), apply); target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), false, (float)GetAmount(), apply); @@ -3651,7 +3651,7 @@ void AuraEffect::HandleModBaseResistance(AuraApplication const* aurApp, uint8 mo if (target->GetTypeId() != TYPEID_PLAYER) { //only pets have base stats - if (target->ToCreature()->isPet() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) + if (target->ToCreature()->IsPet() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) target->HandleStatModifier(UNIT_MOD_ARMOR, TOTAL_VALUE, float(GetAmount()), apply); } else @@ -3704,7 +3704,7 @@ void AuraEffect::HandleAuraModStat(AuraApplication const* aurApp, uint8 mode, bo { //target->ApplyStatMod(Stats(i), m_amount, apply); target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_VALUE, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) + if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->IsPet()) target->ApplyStatBuffMod(Stats(i), (float)GetAmount(), apply); } } @@ -3817,14 +3817,14 @@ void AuraEffect::HandleModTotalPercentStat(AuraApplication const* aurApp, uint8 // save current health state float healthPct = target->GetHealthPct(); - bool alive = target->isAlive(); + bool alive = target->IsAlive(); for (int32 i = STAT_STRENGTH; i < MAX_STATS; i++) { if (GetMiscValueB() & 1 << i || !GetMiscValueB()) // 0 is also used for all stats { target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_PCT, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) + if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->IsPet()) target->ApplyStatPercentBuffMod(Stats(i), float(GetAmount()), apply); } } @@ -4016,7 +4016,7 @@ void AuraEffect::HandleAuraModIncreaseHealthPercent(AuraApplication const* aurAp // Unit will keep hp% after MaxHealth being modified if unit is alive. float percent = target->GetHealthPct(); target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_PCT, float(GetAmount()), apply); - if (target->isAlive()) + if (target->IsAlive()) target->SetHealth(target->CountPctFromMaxHealth(int32(percent))); } @@ -4732,7 +4732,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool // AT REMOVE else { - if ((GetSpellInfo()->IsQuestTame()) && caster && caster->isAlive() && target->isAlive()) + if ((GetSpellInfo()->IsQuestTame()) && caster && caster->IsAlive() && target->IsAlive()) { uint32 finalSpelId = 0; switch (GetId()) @@ -5486,12 +5486,12 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const { // Feeding Frenzy Rank 1 case 53511: - if (target->getVictim() && target->getVictim()->HealthBelowPct(35)) + if (target->GetVictim() && target->GetVictim()->HealthBelowPct(35)) target->CastSpell(target, 60096, true, 0, this); return; // Feeding Frenzy Rank 2 case 53512: - if (target->getVictim() && target->getVictim()->HealthBelowPct(35)) + if (target->GetVictim() && target->GetVictim()->HealthBelowPct(35)) target->CastSpell(target, 60097, true, 0, this); return; default: @@ -5560,10 +5560,6 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) { switch (auraId) { - // Thaumaturgy Channel - case 9712: - triggerSpellId = 21029; - break; // Brood Affliction: Bronze case 23170: triggerSpellId = 23171; @@ -5856,7 +5852,7 @@ void AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick(Unit* target, Unit* void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const { - if (!caster || !target->isAlive()) + if (!caster || !target->IsAlive()) return; if (target->HasUnitState(UNIT_STATE_ISOLATED) || target->IsImmunedToDamage(GetSpellInfo())) @@ -5992,7 +5988,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) const { - if (!caster || !target->isAlive()) + if (!caster || !target->IsAlive()) return; if (target->HasUnitState(UNIT_STATE_ISOLATED) || target->IsImmunedToDamage(GetSpellInfo())) @@ -6047,10 +6043,10 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c damage = (damage <= absorb+resist) ? 0 : (damage-absorb-resist); if (damage) procVictim |= PROC_FLAG_TAKEN_DAMAGE; - if (caster->isAlive()) + if (caster->IsAlive()) caster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, damage, BASE_ATTACK, GetSpellInfo()); int32 new_damage = caster->DealDamage(target, damage, &cleanDamage, DOT, GetSpellInfo()->GetSchoolMask(), GetSpellInfo(), false); - if (caster->isAlive()) + if (caster->IsAlive()) { float gainMultiplier = GetSpellInfo()->Effects[GetEffIndex()].CalcValueMultiplier(caster); @@ -6064,7 +6060,7 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c void AuraEffect::HandlePeriodicHealthFunnelAuraTick(Unit* target, Unit* caster) const { - if (!caster || !caster->isAlive() || !target->isAlive()) + if (!caster || !caster->IsAlive() || !target->IsAlive()) return; if (target->HasUnitState(UNIT_STATE_ISOLATED)) @@ -6092,7 +6088,7 @@ void AuraEffect::HandlePeriodicHealthFunnelAuraTick(Unit* target, Unit* caster) void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const { - if (!caster || !target->isAlive()) + if (!caster || !target->IsAlive()) return; if (target->HasUnitState(UNIT_STATE_ISOLATED)) @@ -6102,7 +6098,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const } // heal for caster damage (must be alive) - if (target != caster && GetSpellInfo()->AttributesEx2 & SPELL_ATTR2_HEALTH_FUNNEL && !caster->isAlive()) + if (target != caster && GetSpellInfo()->AttributesEx2 & SPELL_ATTR2_HEALTH_FUNNEL && !caster->IsAlive()) return; // don't regen when permanent aura target has full power @@ -6200,7 +6196,7 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con { Powers powerType = Powers(GetMiscValue()); - if (!caster || !caster->isAlive() || !target->isAlive() || target->getPowerType() != powerType) + if (!caster || !caster->IsAlive() || !target->IsAlive() || target->getPowerType() != powerType) return; if (target->HasUnitState(UNIT_STATE_ISOLATED) || target->IsImmunedToDamage(GetSpellInfo())) @@ -6269,7 +6265,7 @@ void AuraEffect::HandleObsModPowerAuraTick(Unit* target, Unit* caster) const else powerType = Powers(GetMiscValue()); - if (!target->isAlive() || !target->GetMaxPower(powerType)) + if (!target->IsAlive() || !target->GetMaxPower(powerType)) return; if (target->HasUnitState(UNIT_STATE_ISOLATED)) @@ -6300,7 +6296,7 @@ void AuraEffect::HandlePeriodicEnergizeAuraTick(Unit* target, Unit* caster) cons { Powers powerType = Powers(GetMiscValue()); - if (!target->isAlive() || !target->GetMaxPower(powerType)) + if (!target->IsAlive() || !target->GetMaxPower(powerType)) return; if (target->HasUnitState(UNIT_STATE_ISOLATED)) @@ -6332,7 +6328,7 @@ void AuraEffect::HandlePeriodicPowerBurnAuraTick(Unit* target, Unit* caster) con { Powers powerType = Powers(GetMiscValue()); - if (!caster || !target->isAlive() || target->getPowerType() != powerType) + if (!caster || !target->IsAlive() || target->getPowerType() != powerType) return; if (target->HasUnitState(UNIT_STATE_ISOLATED) || target->IsImmunedToDamage(GetSpellInfo())) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 12cd3c93c98..6546fd16d78 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -544,7 +544,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) // persistent area aura does not hit flying targets if (GetType() == DYNOBJ_AURA_TYPE) { - if (itr->first->isInFlight()) + if (itr->first->IsInFlight()) addUnit = false; } // unit auras can not stack with each other diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 4e0c0e0f831..731b77c9c5b 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -650,7 +650,7 @@ void Spell::InitExplicitTargets(SpellCastTargets const& targets) } // try to use attacked unit as a target else if ((m_caster->GetTypeId() == TYPEID_UNIT) && neededTargets & (TARGET_FLAG_UNIT_ENEMY | TARGET_FLAG_UNIT)) - unit = m_caster->getVictim(); + unit = m_caster->GetVictim(); // didn't find anything - let's use self as target if (!unit && neededTargets & (TARGET_FLAG_UNIT_RAID | TARGET_FLAG_UNIT_PARTY | TARGET_FLAG_UNIT_ALLY)) @@ -1166,7 +1166,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge case TYPEID_PLAYER: { Unit* unitTarget = (*itr)->ToUnit(); - if (unitTarget->isAlive() || !playerCaster->isHonorOrXPTarget(unitTarget) + if (unitTarget->IsAlive() || !playerCaster->isHonorOrXPTarget(unitTarget) || ((unitTarget->GetCreatureTypeMask() & (1 << (CREATURE_TYPE_HUMANOID-1))) == 0) || (unitTarget->GetDisplayId() != unitTarget->GetNativeDisplayId())) break; @@ -1523,7 +1523,7 @@ void Spell::SelectImplicitCasterObjectTargets(SpellEffIndex effIndex, SpellImpli target = m_caster->GetGuardianPet(); break; case TARGET_UNIT_SUMMONER: - if (m_caster->isSummon()) + if (m_caster->IsSummon()) target = m_caster->ToTempSummon()->GetSummoner(); break; case TARGET_UNIT_VEHICLE: @@ -2098,7 +2098,7 @@ void Spell::prepareDataForTriggerSystem(AuraEffect const* /*triggeredByAura*/) m_procEx |= PROC_EX_INTERNAL_TRIGGERED; } // Totem casts require spellfamilymask defined in spell_proc_event to proc - if (m_originalCaster && m_caster != m_originalCaster && m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->isTotem() && m_caster->IsControlledByPlayer()) + if (m_originalCaster && m_caster != m_originalCaster && m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsTotem() && m_caster->IsControlledByPlayer()) m_procEx |= PROC_EX_INTERNAL_REQ_FAMILY; } @@ -2155,7 +2155,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= targetInfo.targetGUID = targetGUID; // Store target GUID targetInfo.effectMask = effectMask; // Store all effects not immune targetInfo.processed = false; // Effects not apply on target - targetInfo.alive = target->isAlive(); + targetInfo.alive = target->IsAlive(); targetInfo.damage = 0; targetInfo.crit = false; targetInfo.scaleAura = false; @@ -2354,7 +2354,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) return; } - if (unit->isAlive() != target->alive) + if (unit->IsAlive() != target->alive) return; if (getState() == SPELL_STATE_DELAYED && !m_spellInfo->IsPositive() && (getMSTime() - target->timeDelay) <= unit->m_lastSanctuaryTime) @@ -2561,7 +2561,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) // cast at creature (or GO) quest objectives update at successful cast finished (+channel finished) // ignore pets or autorepeat/melee casts for speed (not exist quest for spells (hm...) - if (m_originalCaster && m_originalCaster->IsControlledByPlayer() && !spellHitTarget->ToCreature()->isPet() && !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive()) + if (m_originalCaster && m_originalCaster->IsControlledByPlayer() && !spellHitTarget->ToCreature()->IsPet() && !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive()) if (Player* p = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself()) p->CastedCreatureOrGO(spellHitTarget->GetEntry(), spellHitTarget->GetGUID(), m_spellInfo->Id); } @@ -2643,7 +2643,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA if (m_caster->GetTypeId() == TYPEID_PLAYER) m_caster->ToPlayer()->UpdatePvP(true); } - if (unit->isInCombat() && !(m_spellInfo->AttributesEx3 & SPELL_ATTR3_NO_INITIAL_AGGRO)) + if (unit->IsInCombat() && !(m_spellInfo->AttributesEx3 & SPELL_ATTR3_NO_INITIAL_AGGRO)) { m_caster->SetInCombatState(unit->GetCombatTimer() > 0, unit); unit->getHostileRefManager().threatAssist(m_caster, 0.0f); @@ -3185,7 +3185,7 @@ void Spell::cast(bool skipCheck) // This prevents spells such as Hunter's Mark from triggering pet attack if (this->GetSpellInfo()->DmgClass != SPELL_DAMAGE_CLASS_NONE) if (Pet* playerPet = playerCaster->GetPet()) - if (playerPet->isAlive() && playerPet->isControlled() && (m_targets.GetTargetMask() & TARGET_FLAG_UNIT)) + if (playerPet->IsAlive() && playerPet->isControlled() && (m_targets.GetTargetMask() & TARGET_FLAG_UNIT)) playerPet->AI()->OwnerAttacked(m_targets.GetObjectTarget()->ToUnit()); } @@ -3541,7 +3541,7 @@ void Spell::_handle_finish_phase() } if (m_caster->m_extraAttacks && GetSpellInfo()->HasEffect(SPELL_EFFECT_ADD_EXTRA_ATTACKS)) - m_caster->HandleProcExtraAttackFor(m_caster->getVictim()); + m_caster->HandleProcExtraAttackFor(m_caster->GetVictim()); /// @todo trigger proc phase finish here } @@ -3707,7 +3707,7 @@ void Spell::finish(bool ok) if (!ok) return; - if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->isSummon()) + if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsSummon()) { // Unsummon statue uint32 spell = m_caster->GetUInt32Value(UNIT_CREATED_BY_SPELL); @@ -3906,7 +3906,7 @@ void Spell::SendSpellStart() castFlags |= CAST_FLAG_PENDING; if ((m_caster->GetTypeId() == TYPEID_PLAYER || - (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->isPet())) + (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsPet())) && m_spellInfo->PowerType != POWER_HEALTH) castFlags |= CAST_FLAG_POWER_LEFT_SELF; @@ -3993,7 +3993,7 @@ void Spell::SendSpellGo() castFlags |= CAST_FLAG_PENDING; if ((m_caster->GetTypeId() == TYPEID_PLAYER || - (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->isPet())) + (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsPet())) && m_spellInfo->PowerType != POWER_HEALTH) castFlags |= CAST_FLAG_POWER_LEFT_SELF; // should only be sent to self, but the current messaging doesn't make that possible @@ -4766,7 +4766,7 @@ void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGOT SpellCastResult Spell::CheckCast(bool strict) { // check death state - if (!m_caster->isAlive() && !(m_spellInfo->Attributes & SPELL_ATTR0_PASSIVE) && !((m_spellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_DEAD) || (IsTriggered() && !m_triggeredByAuraSpell))) + if (!m_caster->IsAlive() && !(m_spellInfo->Attributes & SPELL_ATTR0_PASSIVE) && !((m_spellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_DEAD) || (IsTriggered() && !m_triggeredByAuraSpell))) return SPELL_FAILED_CASTER_DEAD; // check cooldowns to prevent cheating @@ -4873,7 +4873,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_spellInfo->ExcludeCasterAuraSpell && m_caster->HasAura(sSpellMgr->GetSpellIdForDifficulty(m_spellInfo->ExcludeCasterAuraSpell, m_caster))) return SPELL_FAILED_CASTER_AURASTATE; - if (reqCombat && m_caster->isInCombat() && !m_spellInfo->CanBeUsedInCombat()) + if (reqCombat && m_caster->IsInCombat() && !m_spellInfo->CanBeUsedInCombat()) return SPELL_FAILED_AFFECTING_COMBAT; } @@ -4991,7 +4991,7 @@ SpellCastResult Spell::CheckCast(bool strict) } // zone check - if (m_caster->GetTypeId() == TYPEID_UNIT || !m_caster->ToPlayer()->isGameMaster()) + if (m_caster->GetTypeId() == TYPEID_UNIT || !m_caster->ToPlayer()->IsGameMaster()) { uint32 zone, area; m_caster->GetZoneAndAreaId(zone, area); @@ -5006,7 +5006,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_caster->IsMounted() && m_caster->GetTypeId() == TYPEID_PLAYER && !(_triggeredCastFlags & TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE) && !m_spellInfo->IsPassive() && !(m_spellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_MOUNTED)) { - if (m_caster->isInFlight()) + if (m_caster->IsInFlight()) return SPELL_FAILED_NOT_ON_TAXI; else return SPELL_FAILED_NOT_MOUNTED; @@ -5167,7 +5167,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (!pet->GetCurrentFoodBenefitLevel(foodItem->GetTemplate()->ItemLevel)) return SPELL_FAILED_FOOD_LOWLEVEL; - if (m_caster->isInCombat() || pet->isInCombat()) + if (m_caster->IsInCombat() || pet->IsInCombat()) return SPELL_FAILED_AFFECTING_COMBAT; break; @@ -5309,7 +5309,7 @@ SpellCastResult Spell::CheckCast(bool strict) { Creature* pet = m_caster->GetGuardianPet(); - if (pet && pet->isAlive()) + if (pet && pet->IsAlive()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; break; @@ -5539,7 +5539,7 @@ SpellCastResult Spell::CheckCast(bool strict) { // not allow cast fly spells if not have req. skills (all spells is self target) // allow always ghost flight spells - if (m_originalCaster && m_originalCaster->GetTypeId() == TYPEID_PLAYER && m_originalCaster->isAlive()) + if (m_originalCaster && m_originalCaster->GetTypeId() == TYPEID_PLAYER && m_originalCaster->IsAlive()) { Battlefield* Bf = sBattlefieldMgr->GetBattlefieldToZoneId(m_originalCaster->GetZoneId()); if (AreaTableEntry const* area = GetAreaEntryByAreaID(m_originalCaster->GetAreaId())) @@ -5609,7 +5609,7 @@ SpellCastResult Spell::CheckPetCast(Unit* target) // dead owner (pets still alive when owners ressed?) if (Unit* owner = m_caster->GetCharmerOrOwner()) - if (!owner->isAlive()) + if (!owner->IsAlive()) return SPELL_FAILED_CASTER_DEAD; if (!target && m_targets.GetUnitTarget()) @@ -6736,7 +6736,7 @@ bool SpellEvent::IsDeletable() const bool Spell::IsValidDeadOrAliveTarget(Unit const* target) const { - if (target->isAlive()) + if (target->IsAlive()) return !m_spellInfo->IsRequiringDeadTarget(); if (m_spellInfo->IsAllowingDeadTarget()) return true; @@ -7359,19 +7359,19 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) switch (_targetSelectionType) { case TARGET_CHECK_ENEMY: - if (unitTarget->isTotem()) + if (unitTarget->IsTotem()) return false; if (!_caster->_IsValidAttackTarget(unitTarget, _spellInfo)) return false; break; case TARGET_CHECK_ALLY: - if (unitTarget->isTotem()) + if (unitTarget->IsTotem()) return false; if (!_caster->_IsValidAssistTarget(unitTarget, _spellInfo)) return false; break; case TARGET_CHECK_PARTY: - if (unitTarget->isTotem()) + if (unitTarget->IsTotem()) return false; if (!_caster->_IsValidAssistTarget(unitTarget, _spellInfo)) return false; @@ -7383,7 +7383,7 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) return false; // nobreak; case TARGET_CHECK_RAID: - if (unitTarget->isTotem()) + if (unitTarget->IsTotem()) return false; if (!_caster->_IsValidAssistTarget(unitTarget, _spellInfo)) return false; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 97a06415a9d..9e7d0418905 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -271,7 +271,7 @@ void Spell::EffectResurrectNew(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || unitTarget->isAlive()) + if (!unitTarget || unitTarget->IsAlive()) return; if (unitTarget->GetTypeId() != TYPEID_PLAYER) @@ -297,7 +297,7 @@ void Spell::EffectInstaKill(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; if (unitTarget->GetTypeId() == TYPEID_PLAYER) @@ -321,7 +321,7 @@ void Spell::EffectEnvironmentalDMG(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; uint32 absorb = 0; @@ -339,7 +339,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH_TARGET) return; - if (unitTarget && unitTarget->isAlive()) + if (unitTarget && unitTarget->IsAlive()) { bool apply_direct_bonus = true; switch (m_spellInfo->SpellFamilyName) @@ -953,7 +953,7 @@ void Spell::EffectJump(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH_TARGET) return; - if (m_caster->isInFlight()) + if (m_caster->IsInFlight()) return; if (!unitTarget) @@ -972,7 +972,7 @@ void Spell::EffectJumpDest(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH) return; - if (m_caster->isInFlight()) + if (m_caster->IsInFlight()) return; if (!m_targets.HasDst()) @@ -1003,7 +1003,7 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || unitTarget->isInFlight()) + if (!unitTarget || unitTarget->IsInFlight()) return; // Pre effects @@ -1196,7 +1196,7 @@ void Spell::EffectPowerDrain(SpellEffIndex effIndex) Powers powerType = Powers(m_spellInfo->Effects[effIndex].MiscValue); - if (!unitTarget || !unitTarget->isAlive() || unitTarget->getPowerType() != powerType || damage < 0) + if (!unitTarget || !unitTarget->IsAlive() || unitTarget->getPowerType() != powerType || damage < 0) return; // add spell damage bonus @@ -1270,7 +1270,7 @@ void Spell::EffectPowerBurn(SpellEffIndex effIndex) Powers powerType = Powers(m_spellInfo->Effects[effIndex].MiscValue); - if (!unitTarget || !unitTarget->isAlive() || unitTarget->getPowerType() != powerType || damage < 0) + if (!unitTarget || !unitTarget->IsAlive() || unitTarget->getPowerType() != powerType || damage < 0) return; // burn x% of target's mana, up to maximum of 2x% of caster's mana (Mana Burn) @@ -1299,7 +1299,7 @@ void Spell::EffectHeal(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH_TARGET) return; - if (unitTarget && unitTarget->isAlive() && damage >= 0) + if (unitTarget && unitTarget->IsAlive() && damage >= 0) { // Try to get original caster Unit* caster = m_originalCasterGUID ? m_originalCaster : m_caster; @@ -1396,7 +1396,7 @@ void Spell::EffectHealPct(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive() || damage < 0) + if (!unitTarget || !unitTarget->IsAlive() || damage < 0) return; // Skip if m_originalCaster not available @@ -1414,7 +1414,7 @@ void Spell::EffectHealMechanical(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive() || damage < 0) + if (!unitTarget || !unitTarget->IsAlive() || damage < 0) return; // Skip if m_originalCaster not available @@ -1431,7 +1431,7 @@ void Spell::EffectHealthLeech(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive() || damage < 0) + if (!unitTarget || !unitTarget->IsAlive() || damage < 0) return; damage = m_caster->SpellDamageBonusDone(unitTarget, m_spellInfo, uint32(damage), SPELL_DIRECT_DAMAGE); @@ -1445,7 +1445,7 @@ void Spell::EffectHealthLeech(SpellEffIndex effIndex) // get max possible damage, don't count overkill for heal uint32 healthGain = uint32(-unitTarget->GetHealthGain(-damage) * healMultiplier); - if (m_caster->isAlive()) + if (m_caster->IsAlive()) { healthGain = m_caster->SpellHealingBonusDone(m_caster, m_spellInfo, healthGain, HEAL); healthGain = m_caster->SpellHealingBonusTaken(m_caster, m_spellInfo, healthGain, HEAL); @@ -1503,7 +1503,7 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) // the maximum number of created additional items uint8 additionalMaxNum=0; // get the chance and maximum number for creating extra items - if (canCreateExtraItems(player, m_spellInfo->Id, additionalCreateChance, additionalMaxNum)) + if (CanCreateExtraItems(player, m_spellInfo->Id, additionalCreateChance, additionalMaxNum)) { // roll with this chance till we roll not to create or we create the max num while (roll_chance_f(additionalCreateChance) && items_count <= additionalMaxNum) @@ -1668,7 +1668,7 @@ void Spell::EffectEnergize(SpellEffIndex effIndex) if (!unitTarget) return; - if (!unitTarget->isAlive()) + if (!unitTarget->IsAlive()) return; if (m_spellInfo->Effects[effIndex].MiscValue < 0 || m_spellInfo->Effects[effIndex].MiscValue >= int8(MAX_POWERS)) @@ -1774,7 +1774,7 @@ void Spell::EffectEnergizePct(SpellEffIndex effIndex) if (!unitTarget) return; - if (!unitTarget->isAlive()) + if (!unitTarget->IsAlive()) return; if (m_spellInfo->Effects[effIndex].MiscValue < 0 || m_spellInfo->Effects[effIndex].MiscValue >= int8(MAX_POWERS)) @@ -1799,7 +1799,7 @@ void Spell::SendLoot(uint64 guid, LootType loottype) if (gameObjTarget) { // Players shouldn't be able to loot gameobjects that are currently despawned - if (!gameObjTarget->isSpawned() && !player->isGameMaster()) + if (!gameObjTarget->isSpawned() && !player->IsGameMaster()) { TC_LOG_ERROR(LOG_FILTER_SPELLS_AURAS, "Possible hacking attempt: Player %s [guid: %u] tried to loot a gameobject [entry: %u id: %u] which is on respawn time without being in GM mode!", player->GetName().c_str(), player->GetGUIDLow(), gameObjTarget->GetEntry(), gameObjTarget->GetGUIDLow()); @@ -2170,7 +2170,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex) case SUMMON_TYPE_TOTEM: { summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id); - if (!summon || !summon->isTotem()) + if (!summon || !summon->IsTotem()) return; // Mana Tide Totem @@ -2418,7 +2418,7 @@ void Spell::EffectDistract(SpellEffIndex /*effIndex*/) return; // Check for possible target - if (!unitTarget || unitTarget->isInCombat()) + if (!unitTarget || unitTarget->IsInCombat()) return; // target must be OK to do this @@ -2445,7 +2445,7 @@ void Spell::EffectPickPocket(SpellEffIndex /*effIndex*/) return; // victim have to be alive and humanoid or undead - if (unitTarget->isAlive() && (unitTarget->GetCreatureTypeMask() &CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0) + if (unitTarget->IsAlive() && (unitTarget->GetCreatureTypeMask() &CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0) m_caster->ToPlayer()->SendLoot(unitTarget->GetGUID(), LOOT_PICKPOCKETING); } @@ -2494,7 +2494,7 @@ void Spell::EffectTeleUnitsFaceCaster(SpellEffIndex effIndex) if (!unitTarget) return; - if (unitTarget->isInFlight()) + if (unitTarget->IsInFlight()) return; float dis = m_spellInfo->Effects[effIndex].CalcRadius(m_caster); @@ -2771,7 +2771,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) Creature* creatureTarget = unitTarget->ToCreature(); - if (creatureTarget->isPet()) + if (creatureTarget->IsPet()) return; if (m_caster->getClass() != CLASS_HUNTER) @@ -2820,7 +2820,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex) if (m_originalCaster) { owner = m_originalCaster->ToPlayer(); - if (!owner && m_originalCaster->ToCreature()->isTotem()) + if (!owner && m_originalCaster->ToCreature()->IsTotem()) owner = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself(); } @@ -2877,7 +2877,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex) if (m_caster->GetTypeId() == TYPEID_UNIT) { - if (m_caster->ToCreature()->isTotem()) + if (m_caster->ToCreature()->IsTotem()) pet->SetReactState(REACT_AGGRESSIVE); else pet->SetReactState(REACT_DEFENSIVE); @@ -2930,7 +2930,7 @@ void Spell::EffectTaunt(SpellEffIndex /*effIndex*/) // this effect use before aura Taunt apply for prevent taunt already attacking target // for spell as marked "non effective at already attacking target" if (!unitTarget || !unitTarget->CanHaveThreatList() - || unitTarget->getVictim() == m_caster) + || unitTarget->GetVictim() == m_caster) { SendCastResult(SPELL_FAILED_DONT_REPORT); return; @@ -2959,7 +2959,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH_TARGET) return; - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; // multiple weapon dmg effect workaround @@ -3188,7 +3188,7 @@ void Spell::EffectThreat(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive() || !m_caster->isAlive()) + if (!unitTarget || !unitTarget->IsAlive() || !m_caster->IsAlive()) return; if (!unitTarget->CanHaveThreatList()) @@ -3202,7 +3202,7 @@ void Spell::EffectHealMaxHealth(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; int32 addhealth = 0; @@ -3221,7 +3221,7 @@ void Spell::EffectInterruptCast(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; /// @todo not all spells that used this effect apply cooldown at school spells @@ -3421,7 +3421,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) case 22984: case 22985: { - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; // Onyxia Scale Cloak @@ -3650,7 +3650,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case 52173: // Coyote Spirit Despawn case 60243: // Blood Parrot Despawn - if (unitTarget->GetTypeId() == TYPEID_UNIT && unitTarget->ToCreature()->isSummon()) + if (unitTarget->GetTypeId() == TYPEID_UNIT && unitTarget->ToCreature()->IsSummon()) unitTarget->ToTempSummon()->UnSummon(); return; case 52479: // Gift of the Harvester @@ -3765,7 +3765,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case 60123: // Lightwell { - if (m_caster->GetTypeId() != TYPEID_UNIT || !m_caster->ToCreature()->isSummon()) + if (m_caster->GetTypeId() != TYPEID_UNIT || !m_caster->ToCreature()->IsSummon()) return; uint32 spell_heal; @@ -3813,7 +3813,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) continue; Creature* totem = unitTarget->GetMap()->GetCreature(unitTarget->m_SummonSlot[slot]); - if (totem && totem->isTotem()) + if (totem && totem->IsTotem()) { m_caster->CastCustomSpell(totem, 55277, &basepoints0, NULL, NULL, true); } @@ -3872,7 +3872,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // Judgement (seal trigger) if (m_spellInfo->Category == SPELLCATEGORY_JUDGEMENT) { - if (!unitTarget || !unitTarget->isAlive()) + if (!unitTarget || !unitTarget->IsAlive()) return; uint32 spellId1 = 0; uint32 spellId2 = 0; @@ -3965,7 +3965,7 @@ void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/) Unit::AttackerSet const& attackers = unitTarget->getAttackers(); for (Unit::AttackerSet::const_iterator itr = attackers.begin(); itr != attackers.end();) { - if (!(*itr)->canSeeOrDetect(unitTarget)) + if (!(*itr)->CanSeeOrDetect(unitTarget)) (*(itr++))->AttackStop(); else ++itr; @@ -4107,7 +4107,7 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) TC_LOG_DEBUG(LOG_FILTER_SPELLS_AURAS, "Spell Effect: Stuck"); TC_LOG_INFO(LOG_FILTER_SPELLS_AURAS, "Player %s (guid %u) used auto-unstuck future at map %u (%f, %f, %f)", target->GetName().c_str(), target->GetGUIDLow(), m_caster->GetMapId(), m_caster->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); - if (target->isInFlight()) + if (target->IsInFlight()) return; target->TeleportTo(target->GetStartPosition(), TELE_TO_SPELL); @@ -4336,7 +4336,7 @@ void Spell::EffectFeedPet(SpellEffIndex effIndex) if (!pet) return; - if (!pet->isAlive()) + if (!pet->IsAlive()) return; int32 benefit = pet->GetCurrentFoodBenefitLevel(foodItem->GetTemplate()->ItemLevel); @@ -4357,7 +4357,7 @@ void Spell::EffectDismissPet(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isPet()) + if (!unitTarget || !unitTarget->IsPet()) return; Pet* pet = unitTarget->ToPet(); @@ -4439,7 +4439,7 @@ void Spell::EffectResurrect(SpellEffIndex effIndex) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - if (unitTarget->isAlive() || !unitTarget->IsInWorld()) + if (unitTarget->IsAlive() || !unitTarget->IsInWorld()) return; Player* target = unitTarget->ToPlayer(); @@ -4461,7 +4461,7 @@ void Spell::EffectAddExtraAttacks(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isAlive() || !unitTarget->getVictim()) + if (!unitTarget || !unitTarget->IsAlive() || !unitTarget->GetVictim()) return; if (unitTarget->m_extraAttacks) @@ -4469,7 +4469,7 @@ void Spell::EffectAddExtraAttacks(SpellEffIndex effIndex) unitTarget->m_extraAttacks = damage; - ExecuteLogEffectExtraAttacks(effIndex, unitTarget->getVictim(), damage); + ExecuteLogEffectExtraAttacks(effIndex, unitTarget->GetVictim(), damage); } void Spell::EffectParry(SpellEffIndex /*effIndex*/) @@ -4495,7 +4495,7 @@ void Spell::EffectLeap(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || unitTarget->isInFlight()) + if (!unitTarget || unitTarget->IsInFlight()) return; if (!m_targets.HasDst()) @@ -4569,7 +4569,7 @@ void Spell::EffectSelfResurrect(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) return; - if (!m_caster || m_caster->isAlive()) + if (!m_caster || m_caster->IsAlive()) return; if (m_caster->GetTypeId() != TYPEID_PLAYER) return; @@ -4850,7 +4850,7 @@ void Spell::EffectSummonDeadPet(SpellEffIndex /*effIndex*/) return; Pet* pet = player->GetPet(); - if (pet && pet->isAlive()) + if (pet && pet->IsAlive()) return; if (damage < 0) @@ -4891,7 +4891,7 @@ void Spell::EffectDestroyAllTotems(SpellEffIndex /*effIndex*/) continue; Creature* totem = m_caster->GetMap()->GetCreature(m_caster->m_SummonSlot[slot]); - if (totem && totem->isTotem()) + if (totem && totem->IsTotem()) { uint32 spell_id = totem->GetUInt32Value(UNIT_CREATED_BY_SPELL); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell_id); @@ -5193,7 +5193,7 @@ void Spell::EffectSkinPlayerCorpse(SpellEffIndex /*effIndex*/) return; TC_LOG_DEBUG(LOG_FILTER_SPELLS_AURAS, "Effect: SkinPlayerCorpse"); - if ((m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->isAlive())) + if ((m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->IsAlive())) return; unitTarget->ToPlayer()->RemovedInsignia((Player*)m_caster); @@ -5504,7 +5504,7 @@ void Spell::EffectGameObjectDamage(SpellEffIndex /*effIndex*/) if (!caster) return; - FactionTemplateEntry const* casterFaction = caster->getFactionTemplateEntry(); + FactionTemplateEntry const* casterFaction = caster->GetFactionTemplateEntry(); FactionTemplateEntry const* targetFaction = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION)); // Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls/Ulduar Storm Beacons) if ((casterFaction && targetFaction && !casterFaction->IsFriendlyTo(*targetFaction)) || !targetFaction) @@ -5540,7 +5540,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* if (!caster) return; - if (caster->isTotem()) + if (caster->IsTotem()) caster = caster->ToTotem()->GetOwner(); // in another case summon new @@ -5606,7 +5606,7 @@ void Spell::EffectRenamePet(SpellEffIndex /*effIndex*/) return; if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || - !unitTarget->ToCreature()->isPet() || ((Pet*)unitTarget)->getPetType() != HUNTER_PET) + !unitTarget->ToCreature()->IsPet() || ((Pet*)unitTarget)->getPetType() != HUNTER_PET) return; unitTarget->SetByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED); @@ -5861,7 +5861,7 @@ void Spell::EffectResurrectWithAura(SpellEffIndex effIndex) if (!target) return; - if (unitTarget->isAlive()) + if (unitTarget->IsAlive()) return; if (target->IsRessurectRequested()) // already have one active request diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 88cda9d5db9..85e23f36312 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1665,7 +1665,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta return SPELL_FAILED_BAD_TARGETS; // check visibility - ignore stealth for implicit (area) targets - if (!(AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE) && !caster->canSeeOrDetect(target, implicit)) + if (!(AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE) && !caster->CanSeeOrDetect(target, implicit)) return SPELL_FAILED_BAD_TARGETS; Unit const* unitTarget = target->ToUnit(); @@ -1673,7 +1673,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta // creature/player specific target checks if (unitTarget) { - if (AttributesEx & SPELL_ATTR1_CANT_TARGET_IN_COMBAT && unitTarget->isInCombat()) + if (AttributesEx & SPELL_ATTR1_CANT_TARGET_IN_COMBAT && unitTarget->IsInCombat()) return SPELL_FAILED_TARGET_AFFECTING_COMBAT; // only spells with SPELL_ATTR3_ONLY_TARGET_GHOSTS can target ghosts @@ -1738,7 +1738,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta if (AttributesEx3 & SPELL_ATTR3_ONLY_TARGET_PLAYERS && !unitTarget->ToPlayer()) return SPELL_FAILED_TARGET_NOT_PLAYER; - if (!IsAllowingDeadTarget() && !unitTarget->isAlive()) + if (!IsAllowingDeadTarget() && !unitTarget->IsAlive()) return SPELL_FAILED_TARGETS_DEAD; // check this flag only for implicit targets (chain and area), allow to explicitly target units for spells like Shield of Righteousness @@ -1765,7 +1765,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta if (!unitTarget->ToPlayer()->IsVisible()) return SPELL_FAILED_BM_OR_INVISGOD; - if (unitTarget->ToPlayer()->isGameMaster()) + if (unitTarget->ToPlayer()->IsGameMaster()) return SPELL_FAILED_BM_OR_INVISGOD; } diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 0887af332b1..0b23ece574b 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -387,8 +387,8 @@ void CreatureTextMgr::SendNonChatPacket(WorldObject* source, WorldPacket* data, uint32 areaId = source->GetAreaId(); Map::PlayerList const& players = source->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (itr->getSource()->GetAreaId() == areaId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - itr->getSource()->GetSession()->SendPacket(data); + if (itr->GetSource()->GetAreaId() == areaId && (!team || Team(itr->GetSource()->GetTeam()) == team) && (!gmOnly || itr->GetSource()->IsGameMaster())) + itr->GetSource()->GetSession()->SendPacket(data); return; } case TEXT_RANGE_ZONE: @@ -396,16 +396,16 @@ void CreatureTextMgr::SendNonChatPacket(WorldObject* source, WorldPacket* data, uint32 zoneId = source->GetZoneId(); Map::PlayerList const& players = source->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (itr->getSource()->GetZoneId() == zoneId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - itr->getSource()->GetSession()->SendPacket(data); + if (itr->GetSource()->GetZoneId() == zoneId && (!team || Team(itr->GetSource()->GetTeam()) == team) && (!gmOnly || itr->GetSource()->IsGameMaster())) + itr->GetSource()->GetSession()->SendPacket(data); return; } case TEXT_RANGE_MAP: { Map::PlayerList const& players = source->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if ((!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - itr->getSource()->GetSession()->SendPacket(data); + if ((!team || Team(itr->GetSource()->GetTeam()) == team) && (!gmOnly || itr->GetSource()->IsGameMaster())) + itr->GetSource()->GetSession()->SendPacket(data); return; } case TEXT_RANGE_WORLD: @@ -413,7 +413,7 @@ void CreatureTextMgr::SendNonChatPacket(WorldObject* source, WorldPacket* data, SessionMap const& smap = sWorld->GetAllSessions(); for (SessionMap::const_iterator iter = smap.begin(); iter != smap.end(); ++iter) if (Player* player = iter->second->GetPlayer()) - if (player->GetSession() && (!team || Team(player->GetTeam()) == team) && (!gmOnly || player->isGameMaster())) + if (player->GetSession() && (!team || Team(player->GetTeam()) == team) && (!gmOnly || player->IsGameMaster())) player->GetSession()->SendPacket(data); return; } diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 6edcbf9a88a..c32e35e8770 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -207,8 +207,8 @@ void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder uint32 areaId = source->GetAreaId(); Map::PlayerList const& players = source->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (itr->getSource()->GetAreaId() == areaId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - localizer(itr->getSource()); + if (itr->GetSource()->GetAreaId() == areaId && (!team || Team(itr->GetSource()->GetTeam()) == team) && (!gmOnly || itr->GetSource()->IsGameMaster())) + localizer(itr->GetSource()); return; } case TEXT_RANGE_ZONE: @@ -216,16 +216,16 @@ void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder uint32 zoneId = source->GetZoneId(); Map::PlayerList const& players = source->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (itr->getSource()->GetZoneId() == zoneId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - localizer(itr->getSource()); + if (itr->GetSource()->GetZoneId() == zoneId && (!team || Team(itr->GetSource()->GetTeam()) == team) && (!gmOnly || itr->GetSource()->IsGameMaster())) + localizer(itr->GetSource()); return; } case TEXT_RANGE_MAP: { Map::PlayerList const& players = source->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if ((!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - localizer(itr->getSource()); + if ((!team || Team(itr->GetSource()->GetTeam()) == team) && (!gmOnly || itr->GetSource()->IsGameMaster())) + localizer(itr->GetSource()); return; } case TEXT_RANGE_WORLD: @@ -233,7 +233,7 @@ void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder SessionMap const& smap = sWorld->GetAllSessions(); for (SessionMap::const_iterator iter = smap.begin(); iter != smap.end(); ++iter) if (Player* player = iter->second->GetPlayer()) - if (player->GetSession() && (!team || Team(player->GetTeam()) == team) && (!gmOnly || player->isGameMaster())) + if (player->GetSession() && (!team || Team(player->GetTeam()) == team) && (!gmOnly || player->IsGameMaster())) localizer(player); return; } diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index cb4f0ecf68d..d0793e9ca54 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -230,7 +230,7 @@ public: return false; } - if (!caster->getVictim()) + if (!caster->GetVictim()) { handler->SendSysMessage(LANG_SELECTED_TARGET_NOT_HAVE_VICTIM); handler->SetSentErrorMessage(true); @@ -256,7 +256,7 @@ public: bool triggered = (triggeredStr != NULL); - caster->CastSpell(caster->getVictim(), spellId, triggered); + caster->CastSpell(caster->GetVictim(), spellId, triggered); return true; } diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 84b317a6ca0..3602cb1b6ee 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -797,7 +797,7 @@ public: static bool HandleDebugThreatListCommand(ChatHandler* handler, char const* /*args*/) { Creature* target = handler->getSelectedCreature(); - if (!target || target->isTotem() || target->isPet()) + if (!target || target->IsTotem() || target->IsPet()) return false; ThreatContainer::StorageType const &threatList = target->getThreatManager().getThreatList(); @@ -826,7 +826,7 @@ public: handler->PSendSysMessage("Hostil reference list of %s (guid %u)", target->GetName().c_str(), target->GetGUIDLow()); while (ref) { - if (Unit* unit = ref->getSource()->getOwner()) + if (Unit* unit = ref->GetSource()->GetOwner()) { ++count; handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", count, unit->GetName().c_str(), unit->GetGUIDLow(), ref->getThreat()); diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index e0c338a2dbf..c484f7ef753 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -131,7 +131,7 @@ public: for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { AccountTypes itrSec = itr->second->GetSession()->GetSecurity(); - if ((itr->second->isGameMaster() || + if ((itr->second->IsGameMaster() || (itr->second->GetSession()->HasPermission(RBAC_PERM_COMMANDS_APPEAR_IN_GM_LIST) && itrSec <= AccountTypes(sWorld->getIntConfig(CONFIG_GM_LEVEL_IN_GM_LIST)))) && (!handler->GetSession() || itr->second->IsVisibleGloballyFor(handler->GetSession()->GetPlayer()))) @@ -241,7 +241,7 @@ public: { if (!*args) { - if (handler->GetSession()->GetPlayer()->isGameMaster()) + if (handler->GetSession()->GetPlayer()->IsGameMaster()) handler->GetSession()->SendNotification(LANG_GM_ON); else handler->GetSession()->SendNotification(LANG_GM_OFF); diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 75135199902..8d1db74607f 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -154,7 +154,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -199,7 +199,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -241,7 +241,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -301,7 +301,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -346,7 +346,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -391,7 +391,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -461,7 +461,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -522,7 +522,7 @@ public: } // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -556,7 +556,7 @@ public: } Player* player = handler->GetSession()->GetPlayer(); - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index aa9d9308bcd..e2decc6b184 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -92,7 +92,7 @@ public: state.c_str(), sLFGMgr->GetDungeon(guid)); for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) - GetPlayerInfo(handler, itr->getSource()); + GetPlayerInfo(handler, itr->GetSource()); return true; } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 0108bbc1487..d28c13afde7 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -318,7 +318,7 @@ public: if (map->IsBattlegroundOrArena()) { // only allow if gm mode is on - if (!_player->isGameMaster()) + if (!_player->IsGameMaster()) { handler->PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, chrNameLink.c_str()); handler->SetSentErrorMessage(true); @@ -353,7 +353,7 @@ public: else { // we are not in group, let's verify our GM mode - if (!_player->isGameMaster()) + if (!_player->IsGameMaster()) { handler->PSendSysMessage(LANG_CANNOT_GO_TO_INST_GM, chrNameLink.c_str()); handler->SetSentErrorMessage(true); @@ -383,7 +383,7 @@ public: handler->PSendSysMessage(LANG_APPEARING_AT, chrNameLink.c_str()); // stop flight if need - if (_player->isInFlight()) + if (_player->IsInFlight()) { _player->GetMotionMaster()->MovementExpired(); _player->CleanupAfterTaxiFlight(); @@ -417,7 +417,7 @@ public: return false; // stop flight if need - if (_player->isInFlight()) + if (_player->IsInFlight()) { _player->GetMotionMaster()->MovementExpired(); _player->CleanupAfterTaxiFlight(); @@ -467,7 +467,7 @@ public: if (map->IsBattlegroundOrArena()) { // only allow if gm mode is on - if (!_player->isGameMaster()) + if (!_player->IsGameMaster()) { handler->PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink.c_str()); handler->SetSentErrorMessage(true); @@ -508,7 +508,7 @@ public: ChatHandler(target->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->playerLink(_player->GetName()).c_str()); // stop flight if need - if (target->isInFlight()) + if (target->IsInFlight()) { target->GetMotionMaster()->MovementExpired(); target->CleanupAfterTaxiFlight(); @@ -583,7 +583,7 @@ public: for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player || player == handler->GetSession()->GetPlayer() || !player->GetSession()) continue; @@ -619,7 +619,7 @@ public: ChatHandler(player->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->GetNameLink().c_str()); // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -660,7 +660,7 @@ public: return false; } - if (target->isAlive()) + if (target->IsAlive()) { if (sWorld->getBoolConfig(CONFIG_DIE_COMMAND_MODE)) handler->GetSession()->GetPlayer()->Kill(target); @@ -703,7 +703,7 @@ public: return false; } - if (player->isInFlight()) + if (player->IsInFlight()) { handler->SendSysMessage(LANG_YOU_IN_FLIGHT); handler->SetSentErrorMessage(true); @@ -868,7 +868,7 @@ public: } // stop flight if need - if (target->isInFlight()) + if (target->IsInFlight()) { target->GetMotionMaster()->MovementExpired(); target->CleanupAfterTaxiFlight(); @@ -964,7 +964,7 @@ public: if (!handler->extractPlayerTarget(player_str, &player)) return false; - if (player->isInFlight() || player->isInCombat()) + if (player->IsInFlight() || player->IsInCombat()) { SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(7355); if (!spellInfo) @@ -1611,7 +1611,7 @@ public: muteTime = target->GetSession()->m_muteTime; mapId = target->GetMapId(); areaId = target->GetAreaId(); - alive = target->isAlive() ? "Yes" : "No"; + alive = target->IsAlive() ? "Yes" : "No"; gender = target->getGender(); phase = target->GetPhaseMask(); } @@ -1765,7 +1765,7 @@ public: handler->PSendSysMessage(LANG_PINFO_PLAYER, target ? "" : handler->GetTrinityString(LANG_OFFLINE), nameLink.c_str(), lowguid); // Output II. LANG_PINFO_GM_ACTIVE - if (target && target->isGameMaster()) + if (target && target->IsGameMaster()) handler->PSendSysMessage(LANG_PINFO_GM_ACTIVE); // Output III. LANG_PINFO_BANNED if ban exists and is applied @@ -1803,7 +1803,7 @@ public: handler->PSendSysMessage(LANG_PINFO_CHR_ALIVE, alive.c_str()); // Output XIII. LANG_PINFO_CHR_PHASE if player is not in GM mode (GM is in every phase) - if (target && !target->isGameMaster()) // IsInWorld() returns false on loadingscreen, so it's more + if (target && !target->IsGameMaster()) // IsInWorld() returns false on loadingscreen, so it's more handler->PSendSysMessage(LANG_PINFO_CHR_PHASE, phase); // precise than just target (safer ?). // However, as we usually just require a target here, we use target instead. // Output XIV. LANG_PINFO_CHR_MONEY @@ -1876,7 +1876,7 @@ public: Unit* target = handler->getSelectedUnit(); if (player->GetSelection() && target) { - if (target->GetTypeId() != TYPEID_UNIT || target->isPet()) + if (target->GetTypeId() != TYPEID_UNIT || target->IsPet()) { handler->SendSysMessage(LANG_SELECT_CREATURE); handler->SetSentErrorMessage(true); @@ -2232,7 +2232,7 @@ public: return false; } - if (!target->isAlive()) + if (!target->IsAlive()) return true; char* damageStr = strtok((char*)args, " "); @@ -2587,7 +2587,7 @@ public: Player* player = handler->GetSession()->GetPlayer(); Creature* creatureTarget = handler->getSelectedCreature(); - if (!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) + if (!creatureTarget || creatureTarget->IsPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) { handler->PSendSysMessage(LANG_SELECT_CREATURE); handler->SetSentErrorMessage(true); @@ -2773,7 +2773,7 @@ public: { pet->SavePetToDB(PET_SAVE_AS_CURRENT); // not let dismiss dead pet - if (pet->isAlive()) + if (pet->IsAlive()) player->RemovePet(pet, PET_SAVE_NOT_IN_SLOT); } } diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 300b39fc389..49fa87b5d68 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -108,7 +108,7 @@ public: handler->PSendSysMessage("EndPosition (%.3f, %.3f, %.3f)", end.x, end.y, end.z); handler->PSendSysMessage("ActualEndPosition (%.3f, %.3f, %.3f)", actualEnd.x, actualEnd.y, actualEnd.z); - if (!player->isGameMaster()) + if (!player->IsGameMaster()) handler->PSendSysMessage("Enable GM mode to see the path points."); for (uint32 i = 0; i < pointPath.size(); ++i) diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index ed933ffd5bc..9a96544af89 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -443,7 +443,7 @@ public: target->ToPlayer()->SendTalentsInfoData(false); return true; } - else if (target->ToCreature()->isPet()) + else if (target->ToCreature()->IsPet()) { Unit* owner = target->GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer())) @@ -491,7 +491,7 @@ public: std::string targetNameLink = handler->GetNameLink(target); - if (target->isInFlight()) + if (target->IsInFlight()) { handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); @@ -539,7 +539,7 @@ public: std::string targetNameLink = handler->GetNameLink(target); - if (target->isInFlight()) + if (target->IsInFlight()) { handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); @@ -584,7 +584,7 @@ public: std::string targetNameLink = handler->GetNameLink(target); - if (target->isInFlight()) + if (target->IsInFlight()) { handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); @@ -629,7 +629,7 @@ public: std::string targetNameLink = handler->GetNameLink(target); - if (target->isInFlight()) + if (target->IsInFlight()) { handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index eadfd3b8da0..832f8f25158 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -322,7 +322,7 @@ public: { creature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); creature->GetMotionMaster()->Initialize(); - if (creature->isAlive()) // dead creature will reset movement generator at respawn + if (creature->IsAlive()) // dead creature will reset movement generator at respawn { creature->setDeathState(JUST_DIED); creature->Respawn(true); @@ -396,7 +396,7 @@ public: return false; } - if (creature->isPet()) + if (creature->IsPet()) { if (((Pet*)creature)->getPetType() == HUNTER_PET) { @@ -437,7 +437,7 @@ public: else unit = handler->getSelectedCreature(); - if (!unit || unit->isPet() || unit->isTotem()) + if (!unit || unit->IsPet() || unit->IsTotem()) { handler->SendSysMessage(LANG_SELECT_CREATURE); handler->SetSentErrorMessage(true); @@ -461,7 +461,7 @@ public: return false; Creature* vendor = handler->getSelectedCreature(); - if (!vendor || !vendor->isVendor()) + if (!vendor || !vendor->IsVendor()) { handler->SendSysMessage(LANG_COMMAND_VENDORSELECTION); handler->SetSentErrorMessage(true); @@ -780,7 +780,7 @@ public: } creature->SetPosition(x, y, z, o); creature->GetMotionMaster()->Initialize(); - if (creature->isAlive()) // dead creature will reset movement generator at respawn + if (creature->IsAlive()) // dead creature will reset movement generator at respawn { creature->setDeathState(JUST_DIED); creature->Respawn(); @@ -840,7 +840,7 @@ public: Creature* creature = handler->getSelectedCreature(); - if (!creature || creature->isPet()) + if (!creature || creature->IsPet()) { handler->SendSysMessage(LANG_SELECT_CREATURE); handler->SetSentErrorMessage(true); @@ -924,7 +924,7 @@ public: { type_str = guid_str; creature = handler->getSelectedCreature(); - if (!creature || creature->isPet()) + if (!creature || creature->IsPet()) return false; lowguid = creature->GetDBTableGUIDLow(); } @@ -982,7 +982,7 @@ public: creature->SetDefaultMovementType(move_type); creature->GetMotionMaster()->Initialize(); - if (creature->isAlive()) // dead creature will reset movement generator at respawn + if (creature->IsAlive()) // dead creature will reset movement generator at respawn { creature->setDeathState(JUST_DIED); creature->Respawn(); @@ -1026,7 +1026,7 @@ public: creature->SetPhaseMask(phasemask, true); - if (!creature->isPet()) + if (!creature->IsPet()) creature->SaveToDB(); return true; @@ -1060,7 +1060,7 @@ public: creature->SetRespawnRadius((float)option); creature->SetDefaultMovementType(mtype); creature->GetMotionMaster()->Initialize(); - if (creature->isAlive()) // dead creature will reset movement generator at respawn + if (creature->IsAlive()) // dead creature will reset movement generator at respawn { creature->setDeathState(JUST_DIED); creature->Respawn(); @@ -1276,7 +1276,7 @@ public: static bool HandleNpcTameCommand(ChatHandler* handler, char const* /*args*/) { Creature* creatureTarget = handler->getSelectedCreature(); - if (!creatureTarget || creatureTarget->isPet()) + if (!creatureTarget || creatureTarget->IsPet()) { handler->PSendSysMessage (LANG_SELECT_CREATURE); handler->SetSentErrorMessage (true); @@ -1294,7 +1294,7 @@ public: CreatureTemplate const* cInfo = creatureTarget->GetCreatureTemplate(); - if (!cInfo->isTameable (player->CanTameExoticPets())) + if (!cInfo->IsTameable (player->CanTameExoticPets())) { handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry); handler->SetSentErrorMessage (true); diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index 8e45aa6a855..f3427401258 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -208,7 +208,7 @@ public: { // Try reset talents as Hunter Pet Creature* creature = handler->getSelectedCreature(); - if (!*args && creature && creature->isPet()) + if (!*args && creature && creature->IsPet()) { Unit* owner = creature->GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER && creature->ToPet()->IsPermanentPetFor(owner->ToPlayer())) diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index fcc0875ca4f..93ed630fd77 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -183,7 +183,7 @@ public: ChatHandler(target->GetSession()).PSendSysMessage(LANG_TELEPORTED_TO_BY, handler->GetNameLink().c_str()); // stop flight if need - if (target->isInFlight()) + if (target->IsInFlight()) { target->GetMotionMaster()->MovementExpired(); target->CleanupAfterTaxiFlight(); @@ -257,7 +257,7 @@ public: for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (!player || !player->GetSession()) continue; @@ -279,7 +279,7 @@ public: ChatHandler(player->GetSession()).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str()); // stop flight if need - if (player->isInFlight()) + if (player->IsInFlight()) { player->GetMotionMaster()->MovementExpired(); player->CleanupAfterTaxiFlight(); @@ -311,7 +311,7 @@ public: return false; } - if (me->isInCombat()) + if (me->IsInCombat()) { handler->SendSysMessage(LANG_YOU_IN_COMBAT); handler->SetSentErrorMessage(true); @@ -327,7 +327,7 @@ public: } // stop flight if need - if (me->isInFlight()) + if (me->IsInFlight()) { me->GetMotionMaster()->MovementExpired(); me->CleanupAfterTaxiFlight(); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index d301e702174..33b32fa6978 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -129,11 +129,11 @@ class mob_av_marshal_or_warmaster : public CreatureScript switch (eventId) { case EVENT_CHARGE_TARGET: - DoCast(me->getVictim(), SPELL_CHARGE); + DoCast(me->GetVictim(), SPELL_CHARGE); events.ScheduleEvent(EVENT_CHARGE, urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS)); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, urand(10 * IN_MILLISECONDS, 16 * IN_MILLISECONDS)); break; case EVENT_DEMORALIZING_SHOUT: diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index 6dec1796500..1d2d4435966 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -69,7 +69,7 @@ public: if (waterBoltTimer < diff) { - DoCast(me->getVictim(), SPELL_WATERBOLT); + DoCast(me->GetVictim(), SPELL_WATERBOLT); waterBoltTimer = 5 * IN_MILLISECONDS; } else waterBoltTimer -= diff; @@ -159,25 +159,25 @@ public: if (arcaneExplosionTimer < diff) { - DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION); + DoCast(me->GetVictim(), SPELL_ARCANE_EXPLOSION); arcaneExplosionTimer = urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); } else arcaneExplosionTimer -= diff; if (coneOfColdTimer < diff) { - DoCast(me->getVictim(), SPELL_CONE_OF_COLD); + DoCast(me->GetVictim(), SPELL_CONE_OF_COLD); coneOfColdTimer = urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); } else coneOfColdTimer -= diff; if (fireBoltTimer < diff) { - DoCast(me->getVictim(), SPELL_FIREBALL); + DoCast(me->GetVictim(), SPELL_FIREBALL); fireBoltTimer = urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); } else fireBoltTimer -= diff; if (frostboltTimer < diff) { - DoCast(me->getVictim(), SPELL_FROSTBOLT); + DoCast(me->GetVictim(), SPELL_FROSTBOLT); frostboltTimer = urand(4 * IN_MILLISECONDS, 12 * IN_MILLISECONDS); } else frostboltTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 745c310d35c..ba415bf9b37 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -82,25 +82,25 @@ public: if (WhirlwindTimer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); WhirlwindTimer = urand(8 * IN_MILLISECONDS, 18 * IN_MILLISECONDS); } else WhirlwindTimer -= diff; if (Whirlwind2Timer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND2); + DoCast(me->GetVictim(), SPELL_WHIRLWIND2); Whirlwind2Timer = urand(7 * IN_MILLISECONDS, 25 * IN_MILLISECONDS); } else Whirlwind2Timer -= diff; if (KnockdownTimer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKDOWN); + DoCast(me->GetVictim(), SPELL_KNOCKDOWN); KnockdownTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); } else KnockdownTimer -= diff; if (FrenzyTimer <= diff) { - DoCast(me->getVictim(), SPELL_FRENZY); + DoCast(me->GetVictim(), SPELL_FRENZY); FrenzyTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); } else FrenzyTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 2cf7d7cafef..020d82c8be2 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -76,31 +76,31 @@ public: if (CleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); CleaveTimer = urand(10 * IN_MILLISECONDS, 16 * IN_MILLISECONDS); } else CleaveTimer -= diff; if (FrighteningShoutTimer <= diff) { - DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); + DoCast(me->GetVictim(), SPELL_FRIGHTENING_SHOUT); FrighteningShoutTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); } else FrighteningShoutTimer -= diff; if (Whirlwind1Timer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND1); + DoCast(me->GetVictim(), SPELL_WHIRLWIND1); Whirlwind1Timer = urand(6 * IN_MILLISECONDS, 10 * IN_MILLISECONDS); } else Whirlwind1Timer -= diff; if (Whirlwind2Timer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND2); + DoCast(me->GetVictim(), SPELL_WHIRLWIND2); Whirlwind2Timer = urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS); } else Whirlwind2Timer -= diff; if (MortalStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); MortalStrikeTimer = urand(10 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); } else MortalStrikeTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 6939890a702..747793044cf 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -71,19 +71,19 @@ public: if (AvatarTimer <= diff) { - DoCast(me->getVictim(), SPELL_AVATAR); + DoCast(me->GetVictim(), SPELL_AVATAR); AvatarTimer = urand(15 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); } else AvatarTimer -= diff; if (ThunderclapTimer <= diff) { - DoCast(me->getVictim(), SPELL_THUNDERCLAP); + DoCast(me->GetVictim(), SPELL_THUNDERCLAP); ThunderclapTimer = urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); } else ThunderclapTimer -= diff; if (StormboltTimer <= diff) { - DoCast(me->getVictim(), SPELL_STORMBOLT); + DoCast(me->GetVictim(), SPELL_STORMBOLT); StormboltTimer = urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS); } else StormboltTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index b2f46f3e08a..d22ce24083b 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -244,7 +244,7 @@ class boss_alizabal : public CreatureScript me->RemoveAura(SPELL_BLADE_DANCE_DUMMY); me->SetSpeed(MOVE_WALK, 1.0f); me->SetSpeed(MOVE_RUN, 1.14f); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); Hate = false; Skewer = false; break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 905c0c5997d..343f3f577f4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -236,7 +236,7 @@ public: if (RingBossGUID) { Creature* boss = Unit::GetCreature(*me, RingBossGUID); - if (boss && !boss->isAlive() && boss->isDead()) + if (boss && !boss->IsAlive() && boss->isDead()) { RingBossGUID = 0; Event_Timer = 5000; @@ -249,7 +249,7 @@ public: for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) { Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]); - if (mob && !mob->isAlive() && mob->isDead()) + if (mob && !mob->IsAlive() && mob->isDead()) { RingMobGUID[i] = 0; --MobCount; @@ -381,7 +381,7 @@ public: //ThunderClap_Timer if (ThunderClap_Timer <= diff) { - DoCast(me->getVictim(), SPELL_THUNDERCLAP); + DoCast(me->GetVictim(), SPELL_THUNDERCLAP); ThunderClap_Timer = 10000; } else ThunderClap_Timer -= diff; @@ -390,7 +390,7 @@ public: { if (FireballVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBALLVOLLEY); + DoCast(me->GetVictim(), SPELL_FIREBALLVOLLEY); FireballVolley_Timer = 15000; } else FireballVolley_Timer -= diff; } @@ -398,7 +398,7 @@ public: //MightyBlow_Timer if (MightyBlow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MIGHTYBLOW); + DoCast(me->GetVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 10000; } else MightyBlow_Timer -= diff; @@ -481,7 +481,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE) @@ -540,10 +540,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor() && player->GetReputationRank(59) >= REP_FRIENDLY) + if (creature->IsVendor() && player->GetReputationRank(59) >= REP_FRIENDLY) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (player->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 && diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index c5d93ad0c85..8cab58124a0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -64,17 +64,17 @@ public: //FireBlast_Timer if (FireBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBLAST); + DoCast(me->GetVictim(), SPELL_FIREBLAST); FireBlast_Timer = 7000; } else FireBlast_Timer -= diff; //Spirit_Timer if (Spirit_Timer <= diff) { - SummonSpirits(me->getVictim()); - SummonSpirits(me->getVictim()); - SummonSpirits(me->getVictim()); - SummonSpirits(me->getVictim()); + SummonSpirits(me->GetVictim()); + SummonSpirits(me->GetVictim()); + SummonSpirits(me->GetVictim()); + SummonSpirits(me->GetVictim()); Spirit_Timer = 30000; } else Spirit_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index bb4de5b347a..e75147bcb92 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -68,7 +68,7 @@ public: //ShadowBolt_Timer if (ShadowBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWBOLT); + DoCast(me->GetVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 7000; } else ShadowBolt_Timer -= diff; @@ -83,7 +83,7 @@ public: //CurseOfWeakness_Timer if (CurseOfWeakness_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CURSEOFWEAKNESS); + DoCast(me->GetVictim(), SPELL_CURSEOFWEAKNESS); CurseOfWeakness_Timer = 45000; } else CurseOfWeakness_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index aaf0adc57c4..2e7f0064457 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -108,7 +108,7 @@ public: //AvatarOfFlame_Timer if (AvatarOfFlame_Timer <= diff) { - DoCast(me->getVictim(), SPELL_AVATAROFFLAME); + DoCast(me->GetVictim(), SPELL_AVATAROFFLAME); AvatarOfFlame_Timer = 18000; } else AvatarOfFlame_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index bd5a06bf46c..766bc729545 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -78,21 +78,21 @@ public: //MightyBlow_Timer if (MightyBlow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MIGHTYBLOW); + DoCast(me->GetVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 18000; } else MightyBlow_Timer -= diff; //HamString_Timer if (HamString_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HAMSTRING); + DoCast(me->GetVictim(), SPELL_HAMSTRING); HamString_Timer = 15000; } else HamString_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = 9000; } else Cleave_Timer -= diff; @@ -102,9 +102,9 @@ public: if (Adds_Timer <= diff) { // summon 3 Adds every 25s - SummonAdds(me->getVictim()); - SummonAdds(me->getVictim()); - SummonAdds(me->getVictim()); + SummonAdds(me->GetVictim()); + SummonAdds(me->GetVictim()); + SummonAdds(me->GetVictim()); Adds_Timer = 25000; } else Adds_Timer -= diff; @@ -113,8 +113,8 @@ public: //Summon Medics if (!Medics && HealthBelowPct(21)) { - SummonMedics(me->getVictim()); - SummonMedics(me->getVictim()); + SummonMedics(me->GetVictim()); + SummonMedics(me->GetVictim()); Medics = true; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index 02c00b4958c..e0eb1f19bb0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -68,7 +68,7 @@ public: //MortalStrike_Timer if (MortalStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MORTALSTRIKE); + DoCast(me->GetVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = 15000; } else MortalStrike_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index a0ab6f9939c..0848f8bb086 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -60,7 +60,7 @@ public: //GroundTremor_Timer if (GroundTremor_Timer <= diff) { - DoCast(me->getVictim(), SPELL_GROUNDTREMOR); + DoCast(me->GetVictim(), SPELL_GROUNDTREMOR); GroundTremor_Timer = 8000; } else GroundTremor_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index a901bc3d5e3..1a92fc621da 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -81,7 +81,7 @@ public: //PsychicScream_Timer if (PsychicScream_Timer <= diff) { - DoCast(me->getVictim(), SPELL_PSYCHICSCREAM); + DoCast(me->GetVictim(), SPELL_PSYCHICSCREAM); PsychicScream_Timer = 30000; } else PsychicScream_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index 5c496ed597b..750a739d07c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -64,7 +64,7 @@ public: //FieryBurst_Timer if (FieryBurst_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIERYBURST); + DoCast(me->GetVictim(), SPELL_FIERYBURST); FieryBurst_Timer = 6000; } else FieryBurst_Timer -= diff; @@ -73,7 +73,7 @@ public: { if (WarStomp_Timer <= diff) { - DoCast(me->getVictim(), SPELL_WARSTOMP); + DoCast(me->GetVictim(), SPELL_WARSTOMP); WarStomp_Timer = 8000; } else WarStomp_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index bb528de9dca..4fb0785bb8f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -67,21 +67,21 @@ public: //MindBlast_Timer if (MindBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MINDBLAST); + DoCast(me->GetVictim(), SPELL_MINDBLAST); MindBlast_Timer = 14000; } else MindBlast_Timer -= diff; //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWWORDPAIN); + DoCast(me->GetVictim(), SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 18000; } else ShadowWordPain_Timer -= diff; //Smite_Timer if (Smite_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SMITE); + DoCast(me->GetVictim(), SPELL_SMITE); Smite_Timer = 10000; } else Smite_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 2767c76a69e..55a5baf9a70 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -189,7 +189,7 @@ public: me->DeleteThreatList(); me->CombatStop(true); me->LoadCreaturesAddon(); - if (me->isAlive()) + if (me->IsAlive()) me->GetMotionMaster()->MoveTargetedHome(); me->SetLootRecipient(NULL); if (instance) @@ -210,7 +210,7 @@ public: //ShadowVolley_Timer if (ShadowVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWBOLTVOLLEY); + DoCast(me->GetVictim(), SPELL_SHADOWBOLTVOLLEY); ShadowVolley_Timer = 12000; } else ShadowVolley_Timer -= diff; @@ -226,7 +226,7 @@ public: //CurseOfWeakness_Timer if (CurseOfWeakness_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CURSEOFWEAKNESS); + DoCast(me->GetVictim(), SPELL_CURSEOFWEAKNESS); CurseOfWeakness_Timer = 45000; } else CurseOfWeakness_Timer -= diff; @@ -240,7 +240,7 @@ public: //Summon Voidwalkers if (!Voidwalkers && HealthBelowPct(51)) { - DoCast(me->getVictim(), SPELL_SUMMON_VOIDWALKERS, true); + DoCast(me->GetVictim(), SPELL_SUMMON_VOIDWALKERS, true); Voidwalkers = true; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index c748533565b..2718797aa34 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -170,7 +170,7 @@ public: case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break; case NPC_MAGMUS: MagmusGUID = creature->GetGUID(); - if (!creature->isAlive()) + if (!creature->IsAlive()) HandleGameObject(GetData64(DATA_THRONE_DOOR), true); // if Magmus is dead open door to last boss break; } @@ -392,7 +392,7 @@ public: { if (Creature* boss = instance->GetCreature(TombBossGUIDs[i])) { - if (!boss->isAlive()) + if (!boss->IsAlive()) {//do not call EnterEvadeMode(), it will create infinit loops boss->Respawn(); boss->RemoveAllAuras(); @@ -441,7 +441,7 @@ public: { if (Creature* boss = instance->GetCreature(TombBossGUIDs[i])) { - if (!boss->isAlive()) + if (!boss->IsAlive()) { GhostKillCount = i+1; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp index 7081974195f..af777d0474e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp @@ -84,19 +84,19 @@ public: switch (eventId) { case EVENT_FIRE_NOVA: - DoCast(me->getVictim(), SPELL_FIRENOVA); + DoCast(me->GetVictim(), SPELL_FIRENOVA); events.ScheduleEvent(EVENT_FIRE_NOVA, 10 * IN_MILLISECONDS); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, 8 * IN_MILLISECONDS); break; case EVENT_CONFLIGURATION: - DoCast(me->getVictim(), SPELL_CONFLIGURATION); + DoCast(me->GetVictim(), SPELL_CONFLIGURATION); events.ScheduleEvent(EVENT_CONFLIGURATION, 18 * IN_MILLISECONDS); break; case EVENT_THUNDERCLAP: - DoCast(me->getVictim(), SPELL_THUNDERCLAP); + DoCast(me->GetVictim(), SPELL_THUNDERCLAP); events.ScheduleEvent(EVENT_THUNDERCLAP, 20 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index 667265cdba0..cdb0e9e2454 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -151,15 +151,15 @@ public: events.CancelEvent(EVENT_SUMMON_ORC_PACK); break; case EVENT_CORROSIVE_ACID: - DoCast(me->getVictim(), SPELL_CORROSIVE_ACID); + DoCast(me->GetVictim(), SPELL_CORROSIVE_ACID); events.ScheduleEvent(EVENT_CORROSIVE_ACID, 7 * IN_MILLISECONDS); break; case EVENT_FREEZE: - DoCast(me->getVictim(), SPELL_FREEZE); + DoCast(me->GetVictim(), SPELL_FREEZE); events.ScheduleEvent(EVENT_FREEZE, 16 * IN_MILLISECONDS); break; case EVENT_FLAME_BREATH: - DoCast(me->getVictim(), SPELL_FLAMEBREATH); + DoCast(me->GetVictim(), SPELL_FLAMEBREATH); events.ScheduleEvent(EVENT_FLAME_BREATH, 10500); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp index af0e5110523..a55c7578d6e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp @@ -90,11 +90,11 @@ public: switch (eventId) { case EVENT_CROWD_PUMMEL: - DoCast(me->getVictim(), SPELL_CROWDPUMMEL); + DoCast(me->GetVictim(), SPELL_CROWDPUMMEL); events.ScheduleEvent(EVENT_CROWD_PUMMEL, 14 * IN_MILLISECONDS); break; case EVENT_MIGHTY_BLOW: - DoCast(me->getVictim(), SPELL_MIGHTYBLOW); + DoCast(me->GetVictim(), SPELL_MIGHTYBLOW); events.ScheduleEvent(EVENT_MIGHTY_BLOW, 10 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp index 082e1f8e79b..3576d1272ac 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp @@ -93,31 +93,31 @@ public: switch (eventId) { case EVENT_WARSTOMP: - DoCast(me->getVictim(), SPELL_WARSTOMP); + DoCast(me->GetVictim(), SPELL_WARSTOMP); events.ScheduleEvent(EVENT_WARSTOMP, 14 * IN_MILLISECONDS); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, 8 * IN_MILLISECONDS); break; case EVENT_STRIKE: - DoCast(me->getVictim(), SPELL_STRIKE); + DoCast(me->GetVictim(), SPELL_STRIKE); events.ScheduleEvent(EVENT_STRIKE, 10 * IN_MILLISECONDS); break; case EVENT_REND: - DoCast(me->getVictim(), SPELL_REND); + DoCast(me->GetVictim(), SPELL_REND); events.ScheduleEvent(EVENT_REND, 18 * IN_MILLISECONDS); break; case EVENT_SUNDER_ARMOR: - DoCast(me->getVictim(), SPELL_SUNDERARMOR); + DoCast(me->GetVictim(), SPELL_SUNDERARMOR); events.ScheduleEvent(EVENT_SUNDER_ARMOR, 25 * IN_MILLISECONDS); break; case EVENT_KNOCK_AWAY: - DoCast(me->getVictim(), SPELL_KNOCKAWAY); + DoCast(me->GetVictim(), SPELL_KNOCKAWAY); events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS); break; case EVENT_SLOW: - DoCast(me->getVictim(), SPELL_SLOW); + DoCast(me->GetVictim(), SPELL_SLOW); events.ScheduleEvent(EVENT_SLOW, 18 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 09d85a680b8..f7edaeeb388 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -108,19 +108,19 @@ public: switch (eventId) { case EVENT_BLAST_WAVE: - DoCast(me->getVictim(), SPELL_BLASTWAVE); + DoCast(me->GetVictim(), SPELL_BLASTWAVE); events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS); break; case EVENT_SHOUT: - DoCast(me->getVictim(), SPELL_SHOUT); + DoCast(me->GetVictim(), SPELL_SHOUT); events.ScheduleEvent(EVENT_SHOUT, 10 * IN_MILLISECONDS); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, 7 * IN_MILLISECONDS); break; case EVENT_KNOCK_AWAY: - DoCast(me->getVictim(), SPELL_KNOCKAWAY); + DoCast(me->GetVictim(), SPELL_KNOCKAWAY); events.ScheduleEvent(EVENT_KNOCK_AWAY, 14 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp index 8828fcfe753..0e934553ab7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -80,11 +80,11 @@ public: switch (eventId) { case EVENT_SHOOT: - DoCast(me->getVictim(), SPELL_SHOOT); + DoCast(me->GetVictim(), SPELL_SHOOT); events.ScheduleEvent(EVENT_SHOOT, 500); break; case EVENT_STUN_BOMB: - DoCast(me->getVictim(), SPELL_STUNBOMB); + DoCast(me->GetVictim(), SPELL_STUNBOMB); events.ScheduleEvent(EVENT_STUN_BOMB, 14 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp index b8d9377d7c4..edfa5b0c5a6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp @@ -81,15 +81,15 @@ public: switch (eventId) { case EVENT_WHIRLWIND: - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); events.ScheduleEvent(EVENT_WHIRLWIND, 18 * IN_MILLISECONDS); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, 10 * IN_MILLISECONDS); break; case EVENT_THUNDERCLAP: - DoCast(me->getVictim(), SPELL_THUNDERCLAP); + DoCast(me->GetVictim(), SPELL_THUNDERCLAP); events.ScheduleEvent(EVENT_THUNDERCLAP, 16 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index c429931d42b..a521a40ab8e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -82,7 +82,7 @@ public: switch (eventId) { case EVENT_CURSE_OF_BLOOD: - DoCast(me->getVictim(), SPELL_CURSEOFBLOOD); + DoCast(me->GetVictim(), SPELL_CURSEOFBLOOD); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45 * IN_MILLISECONDS); break; case EVENT_HEX: @@ -91,7 +91,7 @@ public: events.ScheduleEvent(EVENT_HEX, 15 * IN_MILLISECONDS); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, 7 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp index a32fefeca40..44f2e98f848 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp @@ -81,7 +81,7 @@ public: switch (eventId) { case EVENT_FLAME_BREAK: - DoCast(me->getVictim(), SPELL_FLAMEBREAK); + DoCast(me->GetVictim(), SPELL_FLAMEBREAK); events.ScheduleEvent(EVENT_FLAME_BREAK, 10 * IN_MILLISECONDS); break; case EVENT_IMMOLATE: @@ -90,7 +90,7 @@ public: events.ScheduleEvent(EVENT_IMMOLATE, 8 * IN_MILLISECONDS); break; case EVENT_TERRIFYING_ROAR: - DoCast(me->getVictim(), SPELL_TERRIFYINGROAR); + DoCast(me->GetVictim(), SPELL_TERRIFYINGROAR); events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 20 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp index 056448854dc..586b7c9e140 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp @@ -90,27 +90,27 @@ public: switch (eventId) { case EVENT_SNAP_KICK: - DoCast(me->getVictim(), SPELL_SNAPKICK); + DoCast(me->GetVictim(), SPELL_SNAPKICK); events.ScheduleEvent(EVENT_SNAP_KICK, 6 * IN_MILLISECONDS); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); events.ScheduleEvent(EVENT_CLEAVE, 12 * IN_MILLISECONDS); break; case EVENT_UPPERCUT: - DoCast(me->getVictim(), SPELL_UPPERCUT); + DoCast(me->GetVictim(), SPELL_UPPERCUT); events.ScheduleEvent(EVENT_UPPERCUT, 14 * IN_MILLISECONDS); break; case EVENT_MORTAL_STRIKE: - DoCast(me->getVictim(), SPELL_MORTALSTRIKE); + DoCast(me->GetVictim(), SPELL_MORTALSTRIKE); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10 * IN_MILLISECONDS); break; case EVENT_PUMMEL: - DoCast(me->getVictim(), SPELL_PUMMEL); + DoCast(me->GetVictim(), SPELL_PUMMEL); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 16 * IN_MILLISECONDS); break; case EVENT_THROW_AXE: - DoCast(me->getVictim(), SPELL_THROWAXE); + DoCast(me->GetVictim(), SPELL_THROWAXE); events.ScheduleEvent(EVENT_THROW_AXE, 8 * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index 73afebfa9f3..5c05d365e00 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -105,7 +105,7 @@ public: events.ScheduleEvent(EVENT_BLAST_WAVE, 12000); break; case EVENT_KNOCK_BACK: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { DoCast(target, SPELL_BLAST_WAVE); // Drop 50% of threat diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index c7459ed2f7d..c93cc291760 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -226,14 +226,14 @@ public: //Breath1_Timer if (Breath1_Timer <= diff) { - DoCast(me->getVictim(), Breath1_Spell); + DoCast(me->GetVictim(), Breath1_Spell); Breath1_Timer = 60000; } else Breath1_Timer -= diff; //Breath2_Timer if (Breath2_Timer <= diff) { - DoCast(me->getVictim(), Breath2_Spell); + DoCast(me->GetVictim(), Breath2_Spell); Breath2_Timer = 60000; } else Breath2_Timer -= diff; @@ -243,7 +243,7 @@ public: ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) { - if ((*i) && (*i)->getSource()) + if ((*i) && (*i)->GetSource()) { if (Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid())) { diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index d1670171d67..04b99c76105 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -99,7 +99,7 @@ public: ShadowOfEbonroc_Timer = urand(25000, 350000); } else ShadowOfEbonroc_Timer -= diff; - if (me->getVictim() && me->getVictim()->HasAura(SPELL_SHADOWOFEBONROC)) + if (me->GetVictim() && me->GetVictim()->HasAura(SPELL_SHADOWOFEBONROC)) { if (Heal_Timer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 3b63d67814e..60564ea1acb 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -75,7 +75,7 @@ public: //WingBuffet_Timer if (WingBuffet_Timer <= diff) { - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { DoCast(target, SPELL_WINGBUFFET); if (DoGetThreat(target)) diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index f90389bc4eb..5035c1e9c89 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -83,7 +83,7 @@ public: //WingBuffet_Timer if (WingBuffet_Timer <= diff) { - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { DoCast(target, SPELL_WINGBUFFET); if (DoGetThreat(target)) diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index f96d6c4a562..28eebe9f71f 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -138,28 +138,28 @@ public: //ShadowFlame_Timer if (ShadowFlame_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWFLAME); + DoCast(me->GetVictim(), SPELL_SHADOWFLAME); ShadowFlame_Timer = 12000; } else ShadowFlame_Timer -= diff; //BellowingRoar_Timer if (BellowingRoar_Timer <= diff) { - DoCast(me->getVictim(), SPELL_BELLOWINGROAR); + DoCast(me->GetVictim(), SPELL_BELLOWINGROAR); BellowingRoar_Timer = 30000; } else BellowingRoar_Timer -= diff; //VeilOfShadow_Timer if (VeilOfShadow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_VEILOFSHADOW); + DoCast(me->GetVictim(), SPELL_VEILOFSHADOW); VeilOfShadow_Timer = 15000; } else VeilOfShadow_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; @@ -167,7 +167,7 @@ public: if (TailLash_Timer <= diff) { //Cast NYI since we need a better check for behind target - //DoCast(me->getVictim(), SPELL_TAILLASH); + //DoCast(me->GetVictim(), SPELL_TAILLASH); TailLash_Timer = 10000; } else TailLash_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index ebf6298b79d..66afb4cd565 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -89,38 +89,38 @@ public: //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = urand(7000, 10000); } else Cleave_Timer -= diff; //WarStomp_Timer if (WarStomp_Timer <= diff) { - DoCast(me->getVictim(), SPELL_WARSTOMP); + DoCast(me->GetVictim(), SPELL_WARSTOMP); WarStomp_Timer = urand(15000, 25000); } else WarStomp_Timer -= diff; //FireballVolley_Timer if (FireballVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBALLVOLLEY); + DoCast(me->GetVictim(), SPELL_FIREBALLVOLLEY); FireballVolley_Timer = urand(12000, 15000); } else FireballVolley_Timer -= diff; //Conflagration_Timer if (Conflagration_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CONFLAGRATION); + DoCast(me->GetVictim(), SPELL_CONFLAGRATION); //We will remove this threat reduction and add an aura check. - //if (DoGetThreat(me->getVictim())) - //DoModifyThreatPercent(me->getVictim(), -50); + //if (DoGetThreat(me->GetVictim())) + //DoModifyThreatPercent(me->GetVictim(), -50); Conflagration_Timer = 12000; } else Conflagration_Timer -= diff; // Aura Check. If the gamer is affected by confliguration we attack a random gamer. - if (me->getVictim() && me->getVictim()->HasAura(SPELL_CONFLAGRATION)) + if (me->GetVictim() && me->GetVictim()->HasAura(SPELL_CONFLAGRATION)) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) me->TauntApply(target); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index e07da353e90..be3d5e42014 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -74,7 +74,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -205,14 +205,14 @@ public: //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = 15000; } else Cleave_Timer -= diff; //FlameBreath_Timer if (FlameBreath_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FLAMEBREATH); + DoCast(me->GetVictim(), SPELL_FLAMEBREATH); FlameBreath_Timer = urand(4000, 8000); } else FlameBreath_Timer -= diff; @@ -240,7 +240,7 @@ public: { // have the victim cast the spell on himself otherwise the third effect aura will be applied // to Vael instead of the player - me->getVictim()->CastSpell(me->getVictim(), SPELL_BURNINGADRENALINE, 1); + me->GetVictim()->CastSpell(me->GetVictim(), SPELL_BURNINGADRENALINE, 1); BurningAdrenalineTank_Timer = 45000; } else BurningAdrenalineTank_Timer -= diff; @@ -248,7 +248,7 @@ public: //FireNova_Timer if (FireNova_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIRENOVA); + DoCast(me->GetVictim(), SPELL_FIRENOVA); FireNova_Timer = 5000; } else FireNova_Timer -= diff; @@ -256,9 +256,9 @@ public: if (TailSwipe_Timer <= diff) { //Only cast if we are behind - /*if (!me->HasInArc(M_PI, me->getVictim())) + /*if (!me->HasInArc(M_PI, me->GetVictim())) { - DoCast(me->getVictim(), SPELL_TAILSWIPE); + DoCast(me->GetVictim(), SPELL_TAILSWIPE); }*/ TailSwipe_Timer = 20000; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 087a1a032bb..ebaca31cbef 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -379,7 +379,7 @@ public: //If nef is dead then we die to so the players get out of combat //and cannot repeat the event - if (!Nefarian || !Nefarian->isAlive()) + if (!Nefarian || !Nefarian->IsAlive()) { NefarianGUID = 0; me->DespawnOrUnsummon(); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 060c2e0506f..b1642f8fc0b 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -110,7 +110,7 @@ public: if (uiSlamTimer <= uiDiff) { if (bCheckChances()) - DoCast(me->getVictim(), SPELL_SMITE_SLAM); + DoCast(me->GetVictim(), SPELL_SMITE_SLAM); uiSlamTimer = 11000; } else uiSlamTimer -= uiDiff; @@ -156,7 +156,7 @@ public: break; case 3: SetCombatMovement(true); - me->GetMotionMaster()->MoveChase(me->getVictim(), me->m_CombatDistance); + me->GetMotionMaster()->MoveChase(me->GetVictim(), me->m_CombatDistance); uiPhase = 0; break; } diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index cd4eaa78e9d..f8fc6e7cfdf 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -232,7 +232,7 @@ public: { if (Creature* summon = Unit::GetCreature(*me, *itr)) { - if (summon->isAlive()) + if (summon->IsAlive()) summon->DisappearAndDie(); else summon->RemoveCorpse(); @@ -249,12 +249,12 @@ public: for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { temp->SetInCombatWith(player); player->SetInCombatWith(temp); @@ -565,7 +565,7 @@ public: void SetDataSummoner() { - if (!me->isSummon()) + if (!me->IsSummon()) return; if (Unit* summon = me->ToTempSummon()->GetSummoner()) @@ -583,7 +583,7 @@ public: void JustDied(Unit* /*killer*/) { - if (!me->isSummon()) + if (!me->IsSummon()) return; if (Unit* summoner = me->ToTempSummon()->GetSummoner()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 52d9c697452..9d59ea5ee1f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -108,7 +108,7 @@ public: if (Repentance_Timer <= diff) { - DoCast(me->getVictim(), SPELL_REPENTANCE); + DoCast(me->GetVictim(), SPELL_REPENTANCE); Talk(SAY_REPENTANCE); Repentance_Timer = urand(25000, 35000); //A little randomness on that spell diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 19023f70c80..1ebde76ea77 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -164,7 +164,7 @@ public: if (Creature* attumen = me->SummonCreature(SUMMON_ATTUMEN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000)) { Attumen = attumen->GetGUID(); - attumen->AI()->AttackStart(me->getVictim()); + attumen->AI()->AttackStart(me->GetVictim()); SetMidnight(attumen, me->GetGUID()); Talk(SAY_APPEAR, Attumen); } @@ -187,10 +187,10 @@ public: { pAttumen->SetDisplayId(MOUNTED_DISPLAYID); pAttumen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (pAttumen->getVictim()) + if (pAttumen->GetVictim()) { - pAttumen->GetMotionMaster()->MoveChase(pAttumen->getVictim()); - pAttumen->SetTarget(pAttumen->getVictim()->GetGUID()); + pAttumen->GetMotionMaster()->MoveChase(pAttumen->GetVictim()); + pAttumen->SetTarget(pAttumen->GetVictim()->GetGUID()); } pAttumen->SetObjectScale(1); } @@ -262,13 +262,13 @@ void boss_attumen::boss_attumenAI::UpdateAI(uint32 diff) if (CleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWCLEAVE); + DoCast(me->GetVictim(), SPELL_SHADOWCLEAVE); CleaveTimer = urand(10000, 15000); } else CleaveTimer -= diff; if (CurseTimer <= diff) { - DoCast(me->getVictim(), SPELL_INTANGIBLE_PRESENCE); + DoCast(me->GetVictim(), SPELL_INTANGIBLE_PRESENCE); CurseTimer = 30000; } else CurseTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index f3bc733e722..7c1e7cac71a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -205,7 +205,7 @@ public: if (AddGUID[i]) { Creature* temp = Creature::GetCreature((*me), AddGUID[i]); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DisappearAndDie(); } } @@ -218,9 +218,9 @@ public: if (AddGUID[i]) { Creature* temp = Creature::GetCreature((*me), AddGUID[i]); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) { - temp->AI()->AttackStart(me->getVictim()); + temp->AI()->AttackStart(me->GetVictim()); DoZoneInCombat(temp); } else EnterEvadeMode(); @@ -252,9 +252,9 @@ public: if (AddGUID[i]) { Creature* temp = Unit::GetCreature((*me), AddGUID[i]); - if (temp && temp->isAlive()) - if (!temp->getVictim()) - temp->AI()->AttackStart(me->getVictim()); + if (temp && temp->IsAlive()) + if (!temp->GetVictim()) + temp->AI()->AttackStart(me->GetVictim()); } } CheckAdds_Timer = 5000; @@ -347,7 +347,7 @@ struct boss_moroes_guestAI : public ScriptedAI if (TempGUID) { Unit* unit = Unit::GetUnit(*me, TempGUID); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) return unit; } @@ -430,7 +430,7 @@ public: if (MindFlay_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MINDFLY); + DoCast(me->GetVictim(), SPELL_MINDFLY); MindFlay_Timer = 12000; // 3 sec channeled } else MindFlay_Timer -= diff; @@ -498,13 +498,13 @@ public: if (JudgementOfCommand_Timer <= diff) { - DoCast(me->getVictim(), SPELL_JUDGEMENTOFCOMMAND); + DoCast(me->GetVictim(), SPELL_JUDGEMENTOFCOMMAND); JudgementOfCommand_Timer = SealOfCommand_Timer + 29000; } else JudgementOfCommand_Timer -= diff; if (HammerOfJustice_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HAMMEROFJUSTICE); + DoCast(me->GetVictim(), SPELL_HAMMEROFJUSTICE); HammerOfJustice_Timer = 12000; } else HammerOfJustice_Timer -= diff; } @@ -566,7 +566,7 @@ public: if (HolyFire_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HOLYFIRE); + DoCast(me->GetVictim(), SPELL_HOLYFIRE); HolyFire_Timer = 22000; } else HolyFire_Timer -= diff; @@ -692,13 +692,13 @@ public: if (Hamstring_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HAMSTRING); + DoCast(me->GetVictim(), SPELL_HAMSTRING); Hamstring_Timer = 12000; } else Hamstring_Timer -= diff; if (MortalStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MORTALSTRIKE); + DoCast(me->GetVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = 18000; } else MortalStrike_Timer -= diff; @@ -750,19 +750,19 @@ public: if (Disarm_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DISARM); + DoCast(me->GetVictim(), SPELL_DISARM); Disarm_Timer = 12000; } else Disarm_Timer -= diff; if (HeroicStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HEROICSTRIKE); + DoCast(me->GetVictim(), SPELL_HEROICSTRIKE); HeroicStrike_Timer = 10000; } else HeroicStrike_Timer -= diff; if (ShieldBash_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHIELDBASH); + DoCast(me->GetVictim(), SPELL_SHIELDBASH); ShieldBash_Timer = 13000; } else ShieldBash_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 305e37a72d3..66c6994f2b6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -184,8 +184,8 @@ public: // get the best suitable target for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* p = i->getSource(); - if (p && p->isAlive() // alive + Player* p = i->GetSource(); + if (p && p->IsAlive() // alive && (!target || target->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best && !p->HasAura(PlayerDebuff[j], 0) // not exhausted && !p->HasAura(PlayerBuff[(j+1)%3], 0) // not on another beam @@ -219,8 +219,8 @@ public: } } // aggro target if Red Beam - if (j == RED_PORTAL && me->getVictim() != target && target->GetTypeId() == TYPEID_PLAYER) - me->getThreatManager().addThreat(target, 100000.0f+DoGetThreat(me->getVictim())); + if (j == RED_PORTAL && me->GetVictim() != target && target->GetTypeId() == TYPEID_PLAYER) + me->getThreatManager().addThreat(target, 100000.0f+DoGetThreat(me->GetVictim())); } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 8165ba5c53b..5e8921825c5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -237,7 +237,7 @@ public: void JustSummoned(Creature* summoned) { - summoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->GetVictim()); } void TakeOff() @@ -309,19 +309,19 @@ public: { if (Movement) { - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); Movement = false; } if (BellowingRoarTimer <= diff) { - DoCast(me->getVictim(), SPELL_BELLOWING_ROAR); + DoCast(me->GetVictim(), SPELL_BELLOWING_ROAR); BellowingRoarTimer = urand(30000, 40000); } else BellowingRoarTimer -= diff; if (SmolderingBreathTimer <= diff) { - DoCast(me->getVictim(), SPELL_SMOLDERING_BREATH); + DoCast(me->GetVictim(), SPELL_SMOLDERING_BREATH); SmolderingBreathTimer = 20000; } else SmolderingBreathTimer -= diff; @@ -370,14 +370,14 @@ public: { for (uint8 i = 0; i <= 3; ++i) { - DoCast(me->getVictim(), SPELL_SUMMON_SKELETON); + DoCast(me->GetVictim(), SPELL_SUMMON_SKELETON); Skeletons = true; } } if (RainofBonesTimer < diff && !RainBones) // only once at the beginning of phase 2 { - DoCast(me->getVictim(), SPELL_RAIN_OF_BONES); + DoCast(me->GetVictim(), SPELL_RAIN_OF_BONES); RainBones = true; SmokingBlastTimer = 20000; } else RainofBonesTimer -= diff; @@ -394,7 +394,7 @@ public: { if (SmokingBlastTimer <= diff) { - DoCast(me->getVictim(), SPELL_SMOKING_BLAST); + DoCast(me->GetVictim(), SPELL_SMOKING_BLAST); SmokingBlastTimer = 1500; //timer wrong } else SmokingBlastTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index e2227c3f304..324c8e077e6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -276,7 +276,7 @@ public: //Infernal Cleanup for (std::vector<uint64>::const_iterator itr = infernals.begin(); itr != infernals.end(); ++itr) if (Unit* pInfernal = Unit::GetUnit(*me, *itr)) - if (pInfernal->isAlive()) + if (pInfernal->IsAlive()) { pInfernal->SetVisible(false); pInfernal->setDeathState(JUST_DIED); @@ -290,7 +290,7 @@ public: for (uint8 i = 0; i < 2; ++i) { Unit* axe = Unit::GetUnit(*me, axes[i]); - if (axe && axe->isAlive()) + if (axe && axe->IsAlive()) axe->Kill(axe); axes[i] = 0; } @@ -324,7 +324,7 @@ public: std::advance(itr, 1); for (; itr != t_list.end(); ++itr) //store the threat list in a different container if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid())) - if (target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + if (target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER) targets.push_back(target); //cut down to size if we have more than 5 targets @@ -348,7 +348,7 @@ public: for (uint8 i = 0; i < 5; ++i) { Unit* target = Unit::GetUnit(*me, enfeeble_targets[i]); - if (target && target->isAlive()) + if (target && target->IsAlive()) target->SetHealth(enfeeble_health[i]); enfeeble_targets[i] = 0; enfeeble_health[i] = 0; @@ -400,8 +400,8 @@ public: if (me->HasUnitState(UNIT_STATE_STUNNED)) // While shifting to phase 2 malchezaar stuns himself return; - if (me->GetUInt64Value(UNIT_FIELD_TARGET) != me->getVictim()->GetGUID()) - me->SetTarget(me->getVictim()->GetGUID()); + if (me->GetUInt64Value(UNIT_FIELD_TARGET) != me->GetVictim()->GetGUID()) + me->SetTarget(me->GetVictim()->GetGUID()); if (phase == 1) { @@ -480,13 +480,13 @@ public: if (SunderArmorTimer <= diff) { - DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); + DoCast(me->GetVictim(), SPELL_SUNDER_ARMOR); SunderArmorTimer = urand(10000, 18000); } else SunderArmorTimer -= diff; if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = urand(6000, 12000); } else Cleave_Timer -= diff; } @@ -502,11 +502,11 @@ public: { if (Unit* axe = Unit::GetUnit(*me, axes[i])) { - if (axe->getVictim()) - DoModifyThreatPercent(axe->getVictim(), -100); + if (axe->GetVictim()) + DoModifyThreatPercent(axe->GetVictim(), -100); if (target) axe->AddThreat(target, 1000000.0f); - //axe->getThreatManager().tauntFadeOut(axe->getVictim()); + //axe->getThreatManager().tauntFadeOut(axe->GetVictim()); //axe->getThreatManager().tauntApply(target); } } @@ -530,7 +530,7 @@ public: if (ShadowNovaTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWNOVA); + DoCast(me->GetVictim(), SPELL_SHADOWNOVA); ShadowNovaTimer = phase == 3 ? 31000 : uint32(-1); } else ShadowNovaTimer -= diff; @@ -540,7 +540,7 @@ public: { Unit* target = NULL; if (phase == 1) - target = me->getVictim(); // the tank + target = me->GetVictim(); // the tank else // anyone but the tank target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); @@ -570,18 +570,18 @@ public: void DoMeleeAttacksIfReady() { - if (me->IsWithinMeleeRange(me->getVictim()) && !me->IsNonMeleeSpellCasted(false)) + if (me->IsWithinMeleeRange(me->GetVictim()) && !me->IsNonMeleeSpellCasted(false)) { //Check for base attack - if (me->isAttackReady() && me->getVictim()) + if (me->isAttackReady() && me->GetVictim()) { - me->AttackerStateUpdate(me->getVictim()); + me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } //Check for offhand attack - if (me->isAttackReady(OFF_ATTACK) && me->getVictim()) + if (me->isAttackReady(OFF_ATTACK) && me->GetVictim()) { - me->AttackerStateUpdate(me->getVictim(), OFF_ATTACK); + me->AttackerStateUpdate(me->GetVictim(), OFF_ATTACK); me->resetAttackTimer(OFF_ATTACK); } } @@ -605,7 +605,7 @@ void netherspite_infernal::netherspite_infernalAI::Cleanup() { Creature* pMalchezaar = Unit::GetCreature(*me, malchezaar); - if (pMalchezaar && pMalchezaar->isAlive()) + if (pMalchezaar && pMalchezaar->IsAlive()) CAST_AI(boss_malchezaar::boss_malchezaarAI, pMalchezaar->AI())->Cleanup(me, point); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 2a349297860..77cf0e4f226 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -195,7 +195,7 @@ public: { Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //only on alive players - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + if (target && target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER) targets.push_back(target); } @@ -424,7 +424,7 @@ public: { if (Creature* unit = me->SummonCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000)) { - unit->Attack(me->getVictim(), true); + unit->Attack(me->GetVictim(), true); unit->setFaction(me->getFaction()); } } @@ -438,7 +438,7 @@ public: { if (Creature* unit = me->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) { - unit->Attack(me->getVictim(), true); + unit->Attack(me->GetVictim(), true); unit->setFaction(me->getFaction()); } } @@ -538,7 +538,7 @@ public: if (CastTimer <= diff) { - DoCast(me->getVictim(), SPELL_WATERBOLT); + DoCast(me->GetVictim(), SPELL_WATERBOLT); CastTimer = urand(2000, 5000); } else CastTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index fe773a1e3a2..c10c45a400d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -105,7 +105,7 @@ public: if (TerestianGUID) { Unit* Terestian = Unit::GetUnit(*me, TerestianGUID); - if (Terestian && Terestian->isAlive()) + if (Terestian && Terestian->IsAlive()) DoCast(Terestian, SPELL_BROKEN_PACT, true); } } else ERROR_INST_DATA(me); @@ -120,7 +120,7 @@ public: if (AmplifyTimer <= diff) { me->InterruptNonMeleeSpells(false); - DoCast(me->getVictim(), SPELL_AMPLIFY_FLAMES); + DoCast(me->GetVictim(), SPELL_AMPLIFY_FLAMES); AmplifyTimer = urand(10000, 20000); } else AmplifyTimer -= diff; @@ -236,7 +236,7 @@ public: if (FireboltTimer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBOLT); + DoCast(me->GetVictim(), SPELL_FIREBOLT); FireboltTimer = 2200; } else FireboltTimer -= diff; @@ -309,7 +309,7 @@ public: if (Minion* Kilrek = me->GetFirstMinion()) { - if (!Kilrek->isAlive()) + if (!Kilrek->IsAlive()) { Kilrek->UnSummon(); DoCast(me, SPELL_SUMMON_IMP, true); @@ -370,7 +370,7 @@ public: if (SacrificeTimer <= diff) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (target && target->isAlive()) + if (target && target->IsAlive()) { DoCast(target, SPELL_SACRIFICE, true); DoCast(target, SPELL_SUMMON_DEMONCHAINS, true); @@ -394,15 +394,15 @@ public: if (SummonTimer <= diff) { if (!PortalGUID[0]) - DoCast(me->getVictim(), SPELL_FIENDISH_PORTAL, false); + DoCast(me->GetVictim(), SPELL_FIENDISH_PORTAL, false); if (!PortalGUID[1]) - DoCast(me->getVictim(), SPELL_FIENDISH_PORTAL_1, false); + DoCast(me->GetVictim(), SPELL_FIENDISH_PORTAL_1, false); if (PortalGUID[0] && PortalGUID[1]) { if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0, 1)])) - pPortal->CastSpell(me->getVictim(), SPELL_SUMMON_FIENDISIMP, false); + pPortal->CastSpell(me->GetVictim(), SPELL_SUMMON_FIENDISIMP, false); SummonTimer = 5000; } } else SummonTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index d1659a07851..9425bf269d1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -105,8 +105,8 @@ void SummonCroneIfReady(InstanceScript* instance, Creature* creature) { if (Creature* pCrone = creature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, creature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) { - if (creature->getVictim()) - pCrone->AI()->AttackStart(creature->getVictim()); + if (creature->GetVictim()) + pCrone->AI()->AttackStart(creature->GetVictim()); } } }; @@ -209,7 +209,7 @@ public: if (FearTimer <= diff) { - DoCast(me->getVictim(), SPELL_SCREAM); + DoCast(me->GetVictim(), SPELL_SCREAM); FearTimer = 30000; } else FearTimer -= diff; @@ -255,7 +255,7 @@ public: if (DorotheeGUID) { Creature* Dorothee = (Unit::GetCreature((*me), DorotheeGUID)); - if (Dorothee && Dorothee->isAlive()) + if (Dorothee && Dorothee->IsAlive()) { CAST_AI(boss_dorothee::boss_dorotheeAI, Dorothee->AI())->TitoDied = true; Talk(SAY_DOROTHEE_TITO_DEATH, Dorothee->GetGUID()); @@ -270,7 +270,7 @@ public: if (YipTimer <= diff) { - DoCast(me->getVictim(), SPELL_YIPPING); + DoCast(me->GetVictim(), SPELL_YIPPING); YipTimer = 10000; } else YipTimer -= diff; @@ -285,7 +285,7 @@ void boss_dorothee::boss_dorotheeAI::SummonTito() { Talk(SAY_DOROTHEE_SUMMON); CAST_AI(mob_tito::mob_titoAI, pTito->AI())->DorotheeGUID = me->GetGUID(); - pTito->AI()->AttackStart(me->getVictim()); + pTito->AI()->AttackStart(me->GetVictim()); SummonedTito = true; TitoDied = false; } @@ -389,7 +389,7 @@ public: if (BrainBashTimer <= diff) { - DoCast(me->getVictim(), SPELL_BRAIN_BASH); + DoCast(me->GetVictim(), SPELL_BRAIN_BASH); BrainBashTimer = 15000; } else BrainBashTimer -= diff; @@ -494,7 +494,7 @@ public: if (CleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); CleaveTimer = 5000; } else CleaveTimer -= diff; @@ -601,19 +601,19 @@ public: if (MangleTimer <= diff) { - DoCast(me->getVictim(), SPELL_MANGLE); + DoCast(me->GetVictim(), SPELL_MANGLE); MangleTimer = urand(5000, 8000); } else MangleTimer -= diff; if (ShredTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHRED); + DoCast(me->GetVictim(), SPELL_SHRED); ShredTimer = urand(10000, 15000); } else ShredTimer -= diff; if (ScreamTimer <= diff) { - DoCast(me->getVictim(), SPELL_FRIGHTENED_SCREAM); + DoCast(me->GetVictim(), SPELL_FRIGHTENED_SCREAM); ScreamTimer = urand(20000, 30000); } else ScreamTimer -= diff; @@ -699,7 +699,7 @@ public: if (ChainLightningTimer <= diff) { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTNING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING); ChainLightningTimer = 15000; } else ChainLightningTimer -= diff; @@ -917,13 +917,13 @@ public: if (FearTimer <= diff) { - DoCast(me->getVictim(), SPELL_TERRIFYING_HOWL); + DoCast(me->GetVictim(), SPELL_TERRIFYING_HOWL); FearTimer = urand(25000, 35000); } else FearTimer -= diff; if (SwipeTimer <= diff) { - DoCast(me->getVictim(), SPELL_WIDE_SWIPE); + DoCast(me->GetVictim(), SPELL_WIDE_SWIPE); SwipeTimer = urand(25000, 30000); } else SwipeTimer -= diff; } @@ -994,10 +994,10 @@ void Resurrect(Creature* target) target->SetFullHealth(); target->SetStandState(UNIT_STAND_STATE_STAND); target->CastSpell(target, SPELL_RES_VISUAL, true); - if (target->getVictim()) + if (target->GetVictim()) { - target->GetMotionMaster()->MoveChase(target->getVictim()); - target->AI()->AttackStart(target->getVictim()); + target->GetMotionMaster()->MoveChase(target->GetVictim()); + target->AI()->AttackStart(target->GetVictim()); } else target->GetMotionMaster()->Initialize(); @@ -1240,10 +1240,10 @@ public: if (JulianneGUID) { Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID)); - if (Julianne && Julianne->getVictim()) + if (Julianne && Julianne->GetVictim()) { - me->AddThreat(Julianne->getVictim(), 1.0f); - AttackStart(Julianne->getVictim()); + me->AddThreat(Julianne->GetVictim(), 1.0f); + AttackStart(Julianne->GetVictim()); } } } @@ -1322,7 +1322,7 @@ public: if (PoisonThrustTimer <= diff) { - DoCast(me->getVictim(), SPELL_POISON_THRUST); + DoCast(me->GetVictim(), SPELL_POISON_THRUST); PoisonThrustTimer = urand(10000, 20000); } else PoisonThrustTimer -= diff; @@ -1390,8 +1390,8 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff) Phase = PHASE_BOTH; IsFakingDeath = false; - if (me->getVictim()) - AttackStart(me->getVictim()); + if (me->GetVictim()) + AttackStart(me->GetVictim()); ResurrectSelfTimer = 0; ResurrectTimer = 1000; @@ -1441,7 +1441,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff) if (urand(0, 1) && SummonedRomulo) { Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID)); - if (Romulo && Romulo->isAlive() && !RomuloDead) + if (Romulo && Romulo->IsAlive() && !RomuloDead) DoCast(Romulo, SPELL_ETERNAL_AFFECTION); } else DoCast(me, SPELL_ETERNAL_AFFECTION); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 8514503a952..796eb22ae67 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -305,7 +305,7 @@ public: RaidWiped = true; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && !i->getSource()->isGameMaster()) + if (i->GetSource()->IsAlive() && !i->GetSource()->IsGameMaster()) { RaidWiped = false; break; @@ -370,7 +370,7 @@ public: { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - if (player->isGameMaster()) + if (player->IsGameMaster()) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); @@ -598,10 +598,10 @@ public: InstanceMap::PlayerList const &PlayerList = map->GetPlayers(); for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive()) + if (i->GetSource()->IsAlive()) { - if (i->getSource()->GetQuestStatus(9645) == QUEST_STATUS_INCOMPLETE) - i->getSource()->CompleteQuest(9645); + if (i->GetSource()->GetQuestStatus(9645) == QUEST_STATUS_INCOMPLETE) + i->GetSource()->CompleteQuest(9645); } } } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 308ff45fac5..35ca6e578de 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -203,7 +203,7 @@ public: for (i = threatlist.begin(); i != threatlist.end(); ++i) { Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) { float threat = me->getThreatManager().getThreat(unit); summonedUnit->AddThreat(unit, threat); @@ -298,14 +298,14 @@ public: me->InterruptSpell(CURRENT_CHANNELED_SPELL); me->InterruptSpell(CURRENT_GENERIC_SPELL); DoCast(me, SPELL_SHOCK_BARRIER, true); - DoCast(me->getVictim(), SPELL_PYROBLAST); + DoCast(me->GetVictim(), SPELL_PYROBLAST); PyroblastTimer = 60000; } else PyroblastTimer -= diff; } if (FireballTimer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBALL_NORMAL); + DoCast(me->GetVictim(), SPELL_FIREBALL_NORMAL); FireballTimer = urand(2000, 6000); } else FireballTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 36324e6b042..53d1c4561bd 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -150,7 +150,7 @@ public: { if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i])) { - if (!pAdd->getVictim()) + if (!pAdd->GetVictim()) { who->SetInCombatWith(pAdd); pAdd->AddThreat(who, 0.0f); @@ -165,7 +165,7 @@ public: void InitializeLackeys() { //can be called if Creature are dead, so avoid - if (!me->isAlive()) + if (!me->IsAlive()) return; uint8 j = 0; @@ -263,7 +263,7 @@ public: { if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i])) { - if (pAdd->isAlive() && pAdd->GetHealth() < health) + if (pAdd->IsAlive() && pAdd->GetHealth() < health) target = pAdd; } } @@ -278,7 +278,7 @@ public: if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) - if (pAdd->isAlive()) + if (pAdd->IsAlive()) target = pAdd; DoCast(target, SPELL_RENEW_NORMAL); @@ -291,7 +291,7 @@ public: if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) - if (pAdd->isAlive() && !pAdd->HasAura(SPELL_SHIELD)) + if (pAdd->IsAlive() && !pAdd->HasAura(SPELL_SHIELD)) target = pAdd; DoCast(target, SPELL_SHIELD); @@ -310,7 +310,7 @@ public: target = me; else if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) - if (pAdd->isAlive()) + if (pAdd->IsAlive()) target = pAdd; } @@ -368,7 +368,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI // in case she is not alive and Reset was for some reason called, respawn her (most likely party wipe after killing her) if (Creature* pDelrissa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_DELRISSA) : 0)) { - if (!pDelrissa->isAlive()) + if (!pDelrissa->IsAlive()) pDelrissa->Respawn(); } } @@ -384,7 +384,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI { if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUIDs[i])) { - if (!pAdd->getVictim() && pAdd != me) + if (!pAdd->GetVictim() && pAdd != me) { who->SetInCombatWith(pAdd); pAdd->AddThreat(who, 0.0f); @@ -394,7 +394,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI if (Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA))) { - if (pDelrissa->isAlive() && !pDelrissa->getVictim()) + if (pDelrissa->IsAlive() && !pDelrissa->GetVictim()) { who->SetInCombatWith(pDelrissa); pDelrissa->AddThreat(who, 0.0f); @@ -425,7 +425,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI if (uiLackeyDeathCount == MAX_ACTIVE_LACKEY) { //time to make her lootable and complete event if she died before lackeys - if (!pDelrissa->isAlive()) + if (!pDelrissa->IsAlive()) { if (!pDelrissa->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE)) pDelrissa->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); @@ -544,8 +544,8 @@ public: { if (Wait_Timer <= diff) { - DoCast(me->getVictim(), SPELL_BACKSTAB, true); - DoCast(me->getVictim(), SPELL_KIDNEY_SHOT, true); + DoCast(me->GetVictim(), SPELL_BACKSTAB, true); + DoCast(me->GetVictim(), SPELL_KIDNEY_SHOT, true); me->SetVisible(true); // ...? Hacklike InVanish = false; } else Wait_Timer -= diff; @@ -553,19 +553,19 @@ public: if (Gouge_Timer <= diff) { - DoCast(me->getVictim(), SPELL_GOUGE); + DoCast(me->GetVictim(), SPELL_GOUGE); Gouge_Timer = 5500; } else Gouge_Timer -= diff; if (Kick_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KICK); + DoCast(me->GetVictim(), SPELL_KICK); Kick_Timer = 7000; } else Kick_Timer -= diff; if (Eviscerate_Timer <= diff) { - DoCast(me->getVictim(), SPELL_EVISCERATE); + DoCast(me->GetVictim(), SPELL_EVISCERATE); Eviscerate_Timer = 4000; } else Eviscerate_Timer -= diff; @@ -632,13 +632,13 @@ public: if (Immolate_Timer <= diff) { - DoCast(me->getVictim(), SPELL_IMMOLATE); + DoCast(me->GetVictim(), SPELL_IMMOLATE); Immolate_Timer = 6000; } else Immolate_Timer -= diff; if (Shadow_Bolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT); Shadow_Bolt_Timer = 5000; } else Shadow_Bolt_Timer -= diff; @@ -712,13 +712,13 @@ public: if (Knockdown_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKDOWN); + DoCast(me->GetVictim(), SPELL_KNOCKDOWN); Knockdown_Timer = 6000; } else Knockdown_Timer -= diff; if (Snap_Kick_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SNAP_KICK); + DoCast(me->GetVictim(), SPELL_SNAP_KICK); Snap_Kick_Timer = 4500; } else Snap_Kick_Timer -= diff; @@ -812,19 +812,19 @@ public: if (Ice_Lance_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ICE_LANCE); + DoCast(me->GetVictim(), SPELL_ICE_LANCE); Ice_Lance_Timer = 12000; } else Ice_Lance_Timer -= diff; if (Cone_of_Cold_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CONE_OF_COLD); + DoCast(me->GetVictim(), SPELL_CONE_OF_COLD); Cone_of_Cold_Timer = 10000; } else Cone_of_Cold_Timer -= diff; if (Frostbolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTBOLT); + DoCast(me->GetVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 8000; } else Frostbolt_Timer -= diff; @@ -943,31 +943,31 @@ public: if (Disarm_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DISARM); + DoCast(me->GetVictim(), SPELL_DISARM); Disarm_Timer = 6000; } else Disarm_Timer -= diff; if (Hamstring_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HAMSTRING); + DoCast(me->GetVictim(), SPELL_HAMSTRING); Hamstring_Timer = 4500; } else Hamstring_Timer -= diff; if (Mortal_Strike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); Mortal_Strike_Timer = 4500; } else Mortal_Strike_Timer -= diff; if (Piercing_Howl_Timer <= diff) { - DoCast(me->getVictim(), SPELL_PIERCING_HOWL); + DoCast(me->GetVictim(), SPELL_PIERCING_HOWL); Piercing_Howl_Timer = 10000; } else Piercing_Howl_Timer -= diff; if (Frightening_Shout_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); + DoCast(me->GetVictim(), SPELL_FRIGHTENING_SHOUT); Frightening_Shout_Timer = 18000; } else Frightening_Shout_Timer -= diff; @@ -1043,11 +1043,11 @@ public: boss_priestess_lackey_commonAI::UpdateAI(diff); - if (me->IsWithinDistInMap(me->getVictim(), ATTACK_DISTANCE)) + if (me->IsWithinDistInMap(me->GetVictim(), ATTACK_DISTANCE)) { if (Wing_Clip_Timer <= diff) { - DoCast(me->getVictim(), SPELL_WING_CLIP); + DoCast(me->GetVictim(), SPELL_WING_CLIP); Wing_Clip_Timer = 4000; } else Wing_Clip_Timer -= diff; @@ -1062,7 +1062,7 @@ public: else { //if go does not exist, then we can cast - DoCast(me->getVictim(), SPELL_FREEZING_TRAP); + DoCast(me->GetVictim(), SPELL_FREEZING_TRAP); Freezing_Trap_Timer = 15000; } } else Freezing_Trap_Timer -= diff; @@ -1073,25 +1073,25 @@ public: { if (Concussive_Shot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CONCUSSIVE_SHOT); + DoCast(me->GetVictim(), SPELL_CONCUSSIVE_SHOT); Concussive_Shot_Timer = 8000; } else Concussive_Shot_Timer -= diff; if (Multi_Shot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MULTI_SHOT); + DoCast(me->GetVictim(), SPELL_MULTI_SHOT); Multi_Shot_Timer = 10000; } else Multi_Shot_Timer -= diff; if (Aimed_Shot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_AIMED_SHOT); + DoCast(me->GetVictim(), SPELL_AIMED_SHOT); Aimed_Shot_Timer = 6000; } else Aimed_Shot_Timer -= diff; if (Shoot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHOOT); + DoCast(me->GetVictim(), SPELL_SHOOT); Shoot_Timer = 2500; } else Shoot_Timer -= diff; } @@ -1174,7 +1174,7 @@ public: if (Frost_Shock_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROST_SHOCK); + DoCast(me->GetVictim(), SPELL_FROST_SHOCK); Frost_Shock_Timer = 7000; } else Frost_Shock_Timer -= diff; @@ -1185,7 +1185,7 @@ public: // if (guid) // { // Unit* pAdd = Unit::GetUnit(*me, (*itr)->guid); - // if (pAdd && pAdd->isAlive()) + // if (pAdd && pAdd->IsAlive()) // { DoCast(me, SPELL_LESSER_HEALING_WAVE); Healing_Wave_Timer = 5000; @@ -1249,19 +1249,19 @@ public: if (Goblin_Dragon_Gun_Timer <= diff) { - DoCast(me->getVictim(), SPELL_GOBLIN_DRAGON_GUN); + DoCast(me->GetVictim(), SPELL_GOBLIN_DRAGON_GUN); Goblin_Dragon_Gun_Timer = 10000; } else Goblin_Dragon_Gun_Timer -= diff; if (Rocket_Launch_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ROCKET_LAUNCH); + DoCast(me->GetVictim(), SPELL_ROCKET_LAUNCH); Rocket_Launch_Timer = 9000; } else Rocket_Launch_Timer -= diff; if (Fel_Iron_Bomb_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FEL_IRON_BOMB); + DoCast(me->GetVictim(), SPELL_FEL_IRON_BOMB); Fel_Iron_Bomb_Timer = 15000; } else Fel_Iron_Bomb_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 5040aaafc4d..e42582814fd 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -115,7 +115,7 @@ public: //Unit* unit = Unit::GetUnit(*me, FelCrystals[i]); if (Creature* creature = Unit::GetCreature(*me, *itr)) { - if (!creature->isAlive()) + if (!creature->IsAlive()) creature->Respawn(); // Let the core handle setting death state, etc. // Only need to set unselectable flag. You can't attack unselectable units so non_attackable flag is not necessary here. @@ -156,7 +156,7 @@ public: pCrystal = NULL; //pCrystal = Unit::GetUnit(*me, FelCrystals[i]); pCrystal = Unit::GetUnit(*me, *itr); - if (pCrystal && pCrystal->isAlive()) + if (pCrystal && pCrystal->IsAlive()) { // select nearest if (!CrystalChosen || me->GetDistanceOrder(pCrystal, CrystalChosen, false)) @@ -192,7 +192,7 @@ public: { //Creature* pCrystal = (Unit::GetCreature(*me, FelCrystals[i])); Creature* pCrystal = Unit::GetCreature(*me, *itr); - if (pCrystal && pCrystal->isAlive()) + if (pCrystal && pCrystal->IsAlive()) pCrystal->Kill(pCrystal); } } @@ -214,7 +214,7 @@ public: if (type == POINT_MOTION_TYPE && id == 1) { Unit* CrystalChosen = Unit::GetUnit(*me, CrystalGUID); - if (CrystalChosen && CrystalChosen->isAlive()) + if (CrystalChosen && CrystalChosen->IsAlive()) { // Make the crystal attackable // We also remove NON_ATTACKABLE in case the database has it set. @@ -303,14 +303,14 @@ public: Talk(SAY_EMPOWERED); Unit* CrystalChosen = Unit::GetUnit(*me, CrystalGUID); - if (CrystalChosen && CrystalChosen->isAlive()) + if (CrystalChosen && CrystalChosen->IsAlive()) // Use Deal Damage to kill it, not setDeathState. CrystalChosen->Kill(CrystalChosen); CrystalGUID = 0; me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } else EmpowerTimer -= diff; } } @@ -345,7 +345,7 @@ public: if (InstanceScript* instance = me->GetInstanceScript()) { Creature* Selin = (Unit::GetCreature(*me, instance->GetData64(DATA_SELIN))); - if (Selin && Selin->isAlive()) + if (Selin && Selin->IsAlive()) { if (CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->CrystalGUID == me->GetGUID()) { @@ -353,10 +353,10 @@ public: CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->DrainingCrystal = false; CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->IsDraining = false; CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->EmpowerTimer = 10000; - if (Selin->getVictim()) + if (Selin->GetVictim()) { - Selin->AI()->AttackStart(Selin->getVictim()); - Selin->GetMotionMaster()->MoveChase(Selin->getVictim()); + Selin->AI()->AttackStart(Selin->GetVictim()); + Selin->GetMotionMaster()->MoveChase(Selin->GetVictim()); } } } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 8958246f1cf..bea25ec0471 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -185,7 +185,7 @@ public: { if (OverloadTimer <= diff) { - DoCast(me->getVictim(), SPELL_OVERLOAD); + DoCast(me->GetVictim(), SPELL_OVERLOAD); OverloadTimer = 2000; } else OverloadTimer -= diff; @@ -219,7 +219,7 @@ public: { if (Unit* temp = me->GetOwner()) { - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) slayer->CastSpell(slayer, SPELL_ENERGY_FEEDBACK, true, 0, 0, temp->GetGUID()); } } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index daaa7d94d18..2eb9bc83178 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -91,7 +91,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -146,7 +146,7 @@ public: for (Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { if (spell && spell->Effects[0].MiscValue) player->KilledMonsterCredit(spell->Effects[0].MiscValue, 0); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp index a21ca66543e..9d313883b40 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp @@ -146,7 +146,7 @@ class mob_core_rager : public CreatureScript if (Creature* pGolemagg = instance->instance->GetCreature(instance->GetData64(BOSS_GOLEMAGG_THE_INCINERATOR))) { - if (pGolemagg->isAlive()) + if (pGolemagg->IsAlive()) { me->AddAura(SPELL_GOLEMAGG_TRUST, me); Talk(EMOTE_LOWHP); @@ -163,7 +163,7 @@ class mob_core_rager : public CreatureScript // Mangle if (mangleTimer <= diff) { - DoCast(me->getVictim(), SPELL_MANGLE); + DoCast(me->GetVictim(), SPELL_MANGLE); mangleTimer = 10*IN_MILLISECONDS; } else diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 63764b5de01..5e3ff1d4921 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -223,7 +223,7 @@ class boss_ragnaros : public CreatureScript events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, urand(10000, 14000)); break; case EVENT_MAGMA_BLAST: - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { DoCastVictim(SPELL_MAGMA_BLAST); if (!_hasYelledMagmaBurst) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 7328c5cecc9..5f4c564131f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -245,22 +245,22 @@ public: switch (eventId) { case EVENT_ICY_TOUCH: - DoCast(me->getVictim(), SPELL_ICY_TOUCH); + DoCast(me->GetVictim(), SPELL_ICY_TOUCH); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(EVENT_ICY_TOUCH, 5000, GCD_CAST); break; case EVENT_PLAGUE_STRIKE: - DoCast(me->getVictim(), SPELL_PLAGUE_STRIKE); + DoCast(me->GetVictim(), SPELL_PLAGUE_STRIKE); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(SPELL_PLAGUE_STRIKE, 5000, GCD_CAST); break; case EVENT_BLOOD_STRIKE: - DoCast(me->getVictim(), SPELL_BLOOD_STRIKE); + DoCast(me->GetVictim(), SPELL_BLOOD_STRIKE); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(EVENT_BLOOD_STRIKE, 5000, GCD_CAST); break; case EVENT_DEATH_COIL: - DoCast(me->getVictim(), SPELL_DEATH_COIL); + DoCast(me->GetVictim(), SPELL_DEATH_COIL); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST); break; @@ -359,7 +359,7 @@ public: { player->CLOSE_GOSSIP_MENU(); - if (player->isInCombat() || creature->isInCombat()) + if (player->IsInCombat() || creature->IsInCombat()) return true; if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, creature->AI())) @@ -386,7 +386,7 @@ public: if (player->HealthBelowPct(10)) return true; - if (player->isInCombat() || creature->isInCombat()) + if (player->IsInCombat() || creature->IsInCombat()) return true; player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -484,10 +484,10 @@ public: EnterEvadeMode(); return; } - else if (me->getVictim()->GetTypeId() == TYPEID_PLAYER && me->getVictim()->HealthBelowPct(10)) + else if (me->GetVictim()->GetTypeId() == TYPEID_PLAYER && me->GetVictim()->HealthBelowPct(10)) { - me->getVictim()->CastSpell(me->getVictim(), 7267, true); // beg - me->getVictim()->RemoveGameObject(SPELL_DUEL_FLAG, true); + me->GetVictim()->CastSpell(me->GetVictim(), 7267, true); // beg + me->GetVictim()->RemoveGameObject(SPELL_DUEL_FLAG, true); EnterEvadeMode(); return; } @@ -809,7 +809,7 @@ public: { if ((*itr)->GetOwner()->GetGUID() == me->GetOwner()->GetGUID()) { - if ((*itr)->isInCombat() && (*itr)->getAttackerForHelper()) + if ((*itr)->IsInCombat() && (*itr)->getAttackerForHelper()) { AttackStart((*itr)->getAttackerForHelper()); } @@ -820,12 +820,12 @@ public: void UpdateAI(uint32 /*diff*/) { - if (!me->isInCombat()) + if (!me->IsInCombat()) { if (Unit* owner = me->GetOwner()) { Player* plrOwner = owner->ToPlayer(); - if (plrOwner && plrOwner->isInCombat()) + if (plrOwner && plrOwner->IsInCombat()) { if (plrOwner->getAttackerForHelper() && plrOwner->getAttackerForHelper()->GetEntry() == NPC_GHOSTS) AttackStart(plrOwner->getAttackerForHelper()); @@ -840,14 +840,14 @@ public: //ScriptedAI::UpdateAI(diff); //Check if we have a current target - if (me->getVictim()->GetEntry() == NPC_GHOSTS) + if (me->GetVictim()->GetEntry() == NPC_GHOSTS) { if (me->isAttackReady()) { //If we are within range melee the target - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - me->AttackerStateUpdate(me->getVictim()); + me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 1f87d6f65cc..7cc3f3cc2e4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -68,7 +68,7 @@ public: void SpellHit(Unit* caster, const SpellInfo* spell) { - if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && !speechCounter) + if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->IsAlive() && !speechCounter) { if (Player* player = caster->ToPlayer()) { @@ -309,7 +309,7 @@ public: { Creature* temp = Unit::GetCreature(*me, valrothGUID); - if (!temp || !temp->isAlive()) + if (!temp || !temp->IsAlive()) { Talk(SAY_BREAKOUT8); waveTimer = 5000; @@ -405,7 +405,7 @@ public: void UpdateAI(uint32 diff) { - if (uiStage && !me->isInCombat()) + if (uiStage && !me->IsInCombat()) { if (uiStage_timer <= diff) { @@ -498,14 +498,14 @@ public: if (uiInquisitor_Penance_timer <= diff) { Shout(); - DoCast(me->getVictim(), SPELL_INQUISITOR_PENANCE); + DoCast(me->GetVictim(), SPELL_INQUISITOR_PENANCE); uiInquisitor_Penance_timer = urand(2000, 7000); } else uiInquisitor_Penance_timer -= diff; if (uiValroth_Smite_timer <= diff) { Shout(); - DoCast(me->getVictim(), SPELL_VALROTH_SMITE); + DoCast(me->GetVictim(), SPELL_VALROTH_SMITE); uiValroth_Smite_timer = urand(1000, 6000); } else uiValroth_Smite_timer -= diff; @@ -678,7 +678,7 @@ public: void UpdateAI(uint32 diff) { - if (PlayerGUID && !me->getVictim() && me->isAlive()) + if (PlayerGUID && !me->GetVictim() && me->IsAlive()) { if (ExecuteSpeech_Timer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 3d91e81644e..b500ec60b87 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -230,7 +230,7 @@ void UpdateWorldState(Map* map, uint32 id, uint32 state) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->SendUpdateWorldState(id, state); } } @@ -291,7 +291,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE) @@ -1302,8 +1302,8 @@ public: if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource()->isAlive() && me->IsWithinDistInMap(i->getSource(), 50)) - i->getSource()->CastSpell(i->getSource(), SPELL_THE_LIGHT_OF_DAWN_Q, false); + if (i->GetSource()->IsAlive() && me->IsWithinDistInMap(i->GetSource(), 50)) + i->GetSource()->CastSpell(i->GetSource(), SPELL_THE_LIGHT_OF_DAWN_Q, false); } } me->SetVisible(false); // respawns another Darion for quest turn in @@ -1343,25 +1343,25 @@ public: if (uiDeath_strike <= diff) { - DoCast(me->getVictim(), SPELL_DEATH_STRIKE); + DoCast(me->GetVictim(), SPELL_DEATH_STRIKE); uiDeath_strike = urand(5000, 10000); } else uiDeath_strike -= diff; if (uiDeath_embrace <= diff) { - DoCast(me->getVictim(), SPELL_DEATH_EMBRACE); + DoCast(me->GetVictim(), SPELL_DEATH_EMBRACE); uiDeath_embrace = urand(5000, 10000); } else uiDeath_embrace -= diff; if (uiIcy_touch <= diff) { - DoCast(me->getVictim(), SPELL_ICY_TOUCH1); + DoCast(me->GetVictim(), SPELL_ICY_TOUCH1); uiIcy_touch = urand(5000, 10000); } else uiIcy_touch -= diff; if (uiUnholy_blight <= diff) { - DoCast(me->getVictim(), SPELL_UNHOLY_BLIGHT); + DoCast(me->GetVictim(), SPELL_UNHOLY_BLIGHT); uiUnholy_blight = urand(5000, 10000); } else uiUnholy_blight -= diff; @@ -1515,9 +1515,9 @@ public: void NPCChangeTarget(uint64 ui_GUID) { if (Creature* temp = Unit::GetCreature(*me, ui_GUID)) - if (temp->isAlive()) + if (temp->IsAlive()) if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (pTarger->isAlive()) + if (pTarger->IsAlive()) { // temp->DeleteThreatList(); temp->AddThreat(pTarger, 0.0f); @@ -1634,7 +1634,7 @@ public: void DespawnNPC(uint64 pGUID) { if (Creature* temp = Unit::GetCreature(*me, pGUID)) - if (temp->isAlive()) + if (temp->IsAlive()) { temp->SetVisible(false); temp->Kill(temp); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index 3f95d8d0aee..03edcaa882d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -74,7 +74,7 @@ public: if (FlyBackTimer <= diff) { Player* player = NULL; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) player = summoner->ToPlayer(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index db08df50148..b08eb55d7a4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -112,7 +112,7 @@ public: //AoESilence_Timer if (AoESilence_Timer <= diff) { - DoCast(me->getVictim(), SPELL_AOESILENCE); + DoCast(me->GetVictim(), SPELL_AOESILENCE); AoESilence_Timer = urand(15000, 20000); } else AoESilence_Timer -= diff; @@ -120,7 +120,7 @@ public: //ArcaneExplosion_Timer if (ArcaneExplosion_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANEEXPLOSION); + DoCast(me->GetVictim(), SPELL_ARCANEEXPLOSION); ArcaneExplosion_Timer = 8000; } else ArcaneExplosion_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 384ffeb6bf3..ad1a3604354 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -71,7 +71,7 @@ public: //SoulSiphon_Timer if (SoulSiphon_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SOULSIPHON); + DoCast(me->GetVictim(), SPELL_SOULSIPHON); return; //SoulSiphon_Timer = 20000; @@ -82,7 +82,7 @@ public: //CallOfTheGrave_Timer if (CallOftheGrave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CALLOFTHEGRAVE); + DoCast(me->GetVictim(), SPELL_CALLOFTHEGRAVE); CallOftheGrave_Timer = 30000; } else CallOftheGrave_Timer -= diff; @@ -90,7 +90,7 @@ public: //Terrify_Timer if (Terrify_Timer <= diff) { - DoCast(me->getVictim(), SPELL_TERRIFY); + DoCast(me->GetVictim(), SPELL_TERRIFY); Terrify_Timer = 20000; } else Terrify_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index cae033f2a30..60a95b3ffea 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -92,7 +92,7 @@ public: //FlameShock_Timer if (FlameShock_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FLAMESHOCK); + DoCast(me->GetVictim(), SPELL_FLAMESHOCK); FlameShock_Timer = urand(10000, 15000); } else FlameShock_Timer -= diff; @@ -100,7 +100,7 @@ public: //FlameSpike_Timer if (FlameSpike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FLAMESPIKE); + DoCast(me->GetVictim(), SPELL_FLAMESPIKE); FlameSpike_Timer = 30000; } else FlameSpike_Timer -= diff; @@ -108,7 +108,7 @@ public: //FireNova_Timer if (FireNova_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIRENOVA); + DoCast(me->GetVictim(), SPELL_FIRENOVA); FireNova_Timer = 40000; } else FireNova_Timer -= diff; @@ -116,7 +116,7 @@ public: //ShadowBolt_Timer if (ShadowBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWBOLT); + DoCast(me->GetVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; } else ShadowBolt_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 4a610f6678f..da2dadc656a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -320,7 +320,7 @@ public: DoCast(me, SPELL_HEAD, false); SaySound(SAY_LOST_HEAD); me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveFleeing(caster->getVictim()); + me->GetMotionMaster()->MoveFleeing(caster->GetVictim()); } } @@ -332,10 +332,10 @@ public: if (wait <= diff) { wait = 1000; - if (!me->getVictim()) + if (!me->GetVictim()) return; me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveFleeing(me->getVictim()); + me->GetMotionMaster()->MoveFleeing(me->GetVictim()); } else wait -= diff; @@ -544,9 +544,9 @@ public: std::list<Player*> temp; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if ((me->IsWithinLOSInMap(i->getSource()) || !checkLoS) && me->getVictim() != i->getSource() && - me->IsWithinDistInMap(i->getSource(), range) && i->getSource()->isAlive()) - temp.push_back(i->getSource()); + if ((me->IsWithinLOSInMap(i->GetSource()) || !checkLoS) && me->GetVictim() != i->GetSource() && + me->IsWithinDistInMap(i->GetSource(), range) && i->GetSource()->IsAlive()) + temp.push_back(i->GetSource()); if (!temp.empty()) { @@ -577,7 +577,7 @@ public: Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) - sLFGMgr->FinishDungeon(players.begin()->getSource()->GetGroup()->GetGUID(), 285); + sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285); } void SpellHit(Unit* caster, const SpellInfo* spell) @@ -604,7 +604,7 @@ public: for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (unit && unit->isAlive() && unit != caster) + if (unit && unit->IsAlive() && unit != caster) me->AddThreat(unit, caster->getThreatManager().getThreat(unit)); } } @@ -624,7 +624,7 @@ public: headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6), 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0)->GetGUID(); Unit* Head = Unit::GetUnit(*me, headGUID); - if (Head && Head->isAlive()) + if (Head && Head->IsAlive()) { Head->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //Head->CastSpell(Head, SPELL_HEAD_INVIS, false); @@ -731,7 +731,7 @@ public: DoMeleeAttackIfReady(); if (cleave <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); cleave = urand(2000, 6000); //1 cleave per 2.0f-6.0fsec } else cleave -= diff; @@ -749,7 +749,7 @@ public: else Phase = 1; Creature* Head = Unit::GetCreature((*me), headGUID); - if (Head && Head->isAlive()) + if (Head && Head->IsAlive()) { CAST_AI(mob_head::mob_headAI, Head->AI())->Phase = Phase; CAST_AI(mob_head::mob_headAI, Head->AI())->Disappear(); @@ -825,7 +825,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); DoCast(me, SPELL_SPROUT_BODY, true); me->UpdateEntry(PUMPKIN_FIEND); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); } } @@ -850,7 +850,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || !me->IsValidAttackTarget(who) || me->getVictim()) + if (!who || !me->IsValidAttackTarget(who) || me->GetVictim()) return; me->AddThreat(who, 0.0f); @@ -906,7 +906,7 @@ void mob_head::mob_headAI::Disappear() if (bodyGUID) { Creature* body = Unit::GetCreature((*me), bodyGUID); - if (body && body->isAlive()) + if (body && body->IsAlive()) { withbody = true; me->RemoveAllAuras(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 4929e0fbb3d..6f03ae70c81 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -110,7 +110,7 @@ public: //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = 12000; } else Cleave_Timer -= diff; @@ -119,7 +119,7 @@ public: if (Whirlwind_Timer <= diff) { Talk(SAY_WHIRLWIND); - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 30000; } else Whirlwind_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 235add380de..d482fb28894 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -130,7 +130,7 @@ public: //CurseOfBlood_Timer if (CurseOfBlood_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CURSEOFBLOOD); + DoCast(me->GetVictim(), SPELL_CURSEOFBLOOD); CurseOfBlood_Timer = 25000; } else CurseOfBlood_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 4206e958f3c..326fb0e4591 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -110,7 +110,7 @@ public: //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWWORDPAIN); + DoCast(me->GetVictim(), SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = urand(5000, 15000); } else ShadowWordPain_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index c6fdc6e651b..fe12bbc0c5d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -95,7 +95,7 @@ public: me->SetStandState(UNIT_STAND_STATE_STAND); if (instance) - if (me->isAlive()) + if (me->IsAlive()) instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); _bHasDied = false; @@ -192,8 +192,8 @@ public: CrusaderStrike_Timer = 10000; HammerOfJustice_Timer = 10000; - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); _bHeal = true; } @@ -206,7 +206,7 @@ public: //CrusaderStrike_Timer if (CrusaderStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CRUSADERSTRIKE); + DoCast(me->GetVictim(), SPELL_CRUSADERSTRIKE); CrusaderStrike_Timer = 10000; } else CrusaderStrike_Timer -= diff; @@ -214,7 +214,7 @@ public: //HammerOfJustice_Timer if (HammerOfJustice_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HAMMEROFJUSTICE); + DoCast(me->GetVictim(), SPELL_HAMMEROFJUSTICE); HammerOfJustice_Timer = 60000; } else HammerOfJustice_Timer -= diff; @@ -262,7 +262,7 @@ public: _bCanResurrect = false; if (instance) - if (me->isAlive()) + if (me->IsAlive()) instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); } @@ -316,7 +316,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - DoCast(me->getVictim(), SPELL_DEEPSLEEP); + DoCast(me->GetVictim(), SPELL_DEEPSLEEP); _bCanResurrectCheck = true; _bCanResurrect = true; return; @@ -339,7 +339,7 @@ public: if (Creature* mograine = Unit::GetCreature((*me), instance->GetData64(DATA_MOGRAINE))) { // checking _bCanResurrectCheck prevents her healing Mograine while he is "faking death" - if (_bCanResurrectCheck && mograine->isAlive() && !mograine->HealthAbovePct(75)) + if (_bCanResurrectCheck && mograine->IsAlive() && !mograine->HealthAbovePct(75)) target = mograine; } } @@ -362,7 +362,7 @@ public: //HolySmite_Timer if (HolySmite_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HOLYSMITE); + DoCast(me->GetVictim(), SPELL_HOLYSMITE); HolySmite_Timer = 6000; } else HolySmite_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 639db4571cb..66457d48995 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -71,7 +71,7 @@ public: //LichSlap_Timer if (LichSlap_Timer <= diff) { - DoCast(me->getVictim(), SPELL_LICHSLAP); + DoCast(me->GetVictim(), SPELL_LICHSLAP); LichSlap_Timer = 45000; } else LichSlap_Timer -= diff; @@ -79,7 +79,7 @@ public: //FrostboltVolley_Timer if (FrostboltVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTBOLTVOLLEY); + DoCast(me->GetVictim(), SPELL_FROSTBOLTVOLLEY); FrostboltVolley_Timer = 20000; } else FrostboltVolley_Timer -= diff; @@ -87,7 +87,7 @@ public: //MindFlay_Timer if (MindFlay_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MINDFLAY); + DoCast(me->GetVictim(), SPELL_MINDFLAY); MindFlay_Timer = 20000; } else MindFlay_Timer -= diff; @@ -95,7 +95,7 @@ public: //FrostNova_Timer if (FrostNova_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTNOVA); + DoCast(me->GetVictim(), SPELL_FROSTNOVA); FrostNova_Timer = 15000; } else FrostNova_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 8c45231ecbf..2e1f1e554b5 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -122,7 +122,7 @@ public: for (std::set<uint64>::const_iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr) { Creature* add = instance->GetCreature(*itr); - if (add && add->isAlive()) + if (add && add->IsAlive()) add->Kill(add); } HorsemanAdds.clear(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 3f083a30987..1e932e00190 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -94,7 +94,7 @@ public: if (CurseOfBlood_Timer <= diff) { //Cast - DoCast(me->getVictim(), SPELL_CURSEOFBLOOD); + DoCast(me->GetVictim(), SPELL_CURSEOFBLOOD); //45 seconds CurseOfBlood_Timer = 30000; @@ -109,7 +109,7 @@ public: me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetDisplayId(11686); // Invisible Model - DoModifyThreatPercent(me->getVictim(), -99); + DoModifyThreatPercent(me->GetVictim(), -99); //Summon 10 Illusions attacking random gamers Unit* target = NULL; @@ -130,7 +130,7 @@ public: // if (Illusion_Timer <= diff) // { // //Cast - // DoCast(me->getVictim(), SPELL_ILLUSION); + // DoCast(me->GetVictim(), SPELL_ILLUSION); // // //3 Illusion will be summoned // if (Illusioncounter < 3) @@ -190,7 +190,7 @@ public: if (Cleave_Timer <= diff) { //Cast - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); //5-8 seconds Cleave_Timer = urand(5000, 8000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 1167a945992..c386da3fc97 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -82,14 +82,14 @@ public: //ShadowVolley_Timer if (ShadowVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWBOLTVOLLEY); + DoCast(me->GetVictim(), SPELL_SHADOWBOLTVOLLEY); ShadowVolley_Timer = 15000; } else ShadowVolley_Timer -= diff; //BoneShield_Timer if (BoneShield_Timer <= diff) { - DoCast(me->getVictim(), SPELL_BONESHIELD); + DoCast(me->GetVictim(), SPELL_BONESHIELD); BoneShield_Timer = 45000; } else BoneShield_Timer -= diff; @@ -97,10 +97,10 @@ public: if (Minion_Timer <= diff) { //Cast - SummonMinions(me->getVictim()); - SummonMinions(me->getVictim()); - SummonMinions(me->getVictim()); - SummonMinions(me->getVictim()); + SummonMinions(me->GetVictim()); + SummonMinions(me->GetVictim()); + SummonMinions(me->GetVictim()); + SummonMinions(me->GetVictim()); Minion_Timer = 12000; } else Minion_Timer -= diff; @@ -109,8 +109,8 @@ public: if (!Mages && HealthBelowPct(26)) { //Cast - SummonMages(me->getVictim()); - SummonMages(me->getVictim()); + SummonMages(me->GetVictim()); + SummonMages(me->GetVictim()); Mages = true; } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 4483d5332d7..dbe4f2755ce 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -95,28 +95,28 @@ public: //Freeze_Timer if (Freeze_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FREEZE); + DoCast(me->GetVictim(), SPELL_FREEZE); Freeze_Timer = 24000; } else Freeze_Timer -= diff; //Fear_Timer if (Fear_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FEAR); + DoCast(me->GetVictim(), SPELL_FEAR); Fear_Timer = 30000; } else Fear_Timer -= diff; //ChillNova_Timer if (ChillNova_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CHILLNOVA); + DoCast(me->GetVictim(), SPELL_CHILLNOVA); ChillNova_Timer = 14000; } else ChillNova_Timer -= diff; //FrostVolley_Timer if (FrostVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTVOLLEY); + DoCast(me->GetVictim(), SPELL_FROSTVOLLEY); FrostVolley_Timer = 15000; } else FrostVolley_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 85ae16499cf..ee6d9780a1a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -77,7 +77,7 @@ public: //BlastWave_Timer if (m_uiBlastWave_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_BLAST_WAVE); + DoCast(me->GetVictim(), SPELL_BLAST_WAVE); m_uiBlastWave_Timer = 12000; } else diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 1490005791e..4afefa5a688 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -138,7 +138,7 @@ public: Creature* pAda = instance->GetCreature(uiAdaGUID); Creature* pAsh = instance->GetCreature(uiAshGUID); - if (pAda && pAda->isAlive() && pAsh && pAsh->isAlive()) + if (pAda && pAda->IsAlive() && pAsh && pAsh->IsAlive()) { pAda->AI()->Talk(SAY_BOSS_DIE_AD); pAsh->AI()->Talk(SAY_BOSS_DIE_AS); @@ -243,7 +243,7 @@ public: Creature* pArchmage = instance->GetCreature(uiArchmageArugalGUID); - if (!pArchmage || !pArchmage->isAlive()) + if (!pArchmage || !pArchmage->IsAlive()) return; if (uiPhase) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 8b49df5ca84..d1a43c5e4b7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -125,7 +125,7 @@ public: if (ShadowBolt_Timer <= diff) { if (SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(me->getVictim(), SPELL_SHADOWBOLT); + DoCast(me->GetVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 10000; } else ShadowBolt_Timer -= diff; @@ -133,7 +133,7 @@ public: //Cleave if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); //13 seconds until we should cast this again Cleave_Timer = 7000 + (rand()%10000); } else Cleave_Timer -= diff; @@ -141,7 +141,7 @@ public: //MortalStrike if (MortalStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MORTALSTRIKE); + DoCast(me->GetVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = 10000 + (rand()%15000); } else MortalStrike_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index b2adbecbe63..eddaae4e106 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -83,7 +83,7 @@ public: if (BansheeWail_Timer <= diff) { if (rand()%100 < 95) - DoCast(me->getVictim(), SPELL_BANSHEEWAIL); + DoCast(me->GetVictim(), SPELL_BANSHEEWAIL); //4 seconds until we should cast this again BansheeWail_Timer = 4000; } else BansheeWail_Timer -= diff; @@ -92,7 +92,7 @@ public: if (BansheeCurse_Timer <= diff) { if (rand()%100 < 75) - DoCast(me->getVictim(), SPELL_BANSHEECURSE); + DoCast(me->GetVictim(), SPELL_BANSHEECURSE); //18 seconds until we should cast this again BansheeCurse_Timer = 18000; } else BansheeCurse_Timer -= diff; @@ -101,7 +101,7 @@ public: if (Silence_Timer <= diff) { if (rand()%100 < 80) - DoCast(me->getVictim(), SPELL_SILENCE); + DoCast(me->GetVictim(), SPELL_SILENCE); //13 seconds until we should cast this again Silence_Timer = 13000; } else Silence_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 74819269415..98fc6093496 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -131,7 +131,7 @@ public: //Cast if (rand()%100 < 90) //90% chance to cast { - DoCast(me->getVictim(), SPELL_PUMMEL); + DoCast(me->GetVictim(), SPELL_PUMMEL); } //12 seconds until we should cast this again Pummel_Timer = 12000; @@ -143,7 +143,7 @@ public: //Cast if (rand()%100 < 80) //80% chance to cast { - DoCast(me->getVictim(), SPELL_KNOCKAWAY); + DoCast(me->GetVictim(), SPELL_KNOCKAWAY); } //14 seconds until we should cast this again KnockAway_Timer = 14000; @@ -153,7 +153,7 @@ public: if (Shoot_Timer <= diff) { //Cast - DoCast(me->getVictim(), SPELL_SHOOT); + DoCast(me->GetVictim(), SPELL_SHOOT); //1 seconds until we should cast this again Shoot_Timer = 1000; } else Shoot_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index f75a0c4a3dc..96fa0b71876 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -131,28 +131,28 @@ public: //MindBlast if (m_uiMindBlast_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_MINDBLAST); + DoCast(me->GetVictim(), SPELL_MINDBLAST); m_uiMindBlast_Timer = urand(15000, 20000); } else m_uiMindBlast_Timer -= uiDiff; //CrusadersHammer if (m_uiCrusadersHammer_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CRUSADERSHAMMER); + DoCast(me->GetVictim(), SPELL_CRUSADERSHAMMER); m_uiCrusadersHammer_Timer = 12000; } else m_uiCrusadersHammer_Timer -= uiDiff; //CrusaderStrike if (m_uiCrusaderStrike_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CRUSADERSTRIKE); + DoCast(me->GetVictim(), SPELL_CRUSADERSTRIKE); m_uiCrusaderStrike_Timer = 15000; } else m_uiCrusaderStrike_Timer -= uiDiff; //HolyStrike if (m_uiHolyStrike_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_HOLYSTRIKE); + DoCast(me->GetVictim(), SPELL_HOLYSTRIKE); m_uiHolyStrike_Timer = 15000; } else m_uiHolyStrike_Timer -= uiDiff; @@ -173,14 +173,14 @@ public: //MindBlast if (m_uiMindBlast_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_MINDBLAST); + DoCast(me->GetVictim(), SPELL_MINDBLAST); m_uiMindBlast_Timer = urand(15000, 20000); } else m_uiMindBlast_Timer -= uiDiff; //ShadowShock if (m_uiShadowShock_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SHADOWSHOCK); + DoCast(me->GetVictim(), SPELL_SHADOWSHOCK); m_uiShadowShock_Timer = 11000; } else m_uiShadowShock_Timer -= uiDiff; @@ -205,7 +205,7 @@ public: //MindControl if (m_uiMindControl_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_MINDCONTROL); + DoCast(me->GetVictim(), SPELL_MINDCONTROL); m_uiMindControl_Timer = 15000; } else m_uiMindControl_Timer -= uiDiff; } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index 5f4d1cbc0b9..bda54375bdb 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -63,7 +63,7 @@ public: FuriousAnger_Timer = 5000; AngerCount = 0; - if (me->isAlive()) + if (me->IsAlive()) me->SetDisplayId(MODEL_NORMAL); else me->SetDisplayId(MODEL_HUMAN); @@ -104,21 +104,21 @@ public: //DrainingBlow if (DrainingBlow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DRAININGBLOW); + DoCast(me->GetVictim(), SPELL_DRAININGBLOW); DrainingBlow_Timer = 15000; } else DrainingBlow_Timer -= diff; //CrowdPummel if (CrowdPummel_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CROWDPUMMEL); + DoCast(me->GetVictim(), SPELL_CROWDPUMMEL); CrowdPummel_Timer = 15000; } else CrowdPummel_Timer -= diff; //MightyBlow if (MightyBlow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MIGHTYBLOW); + DoCast(me->GetVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 20000; } else MightyBlow_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 2812c1dd39b..25d297b81b7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -82,7 +82,7 @@ public: if (Frostbolt_Timer <= diff) { if (rand()%100 < 90) - DoCast(me->getVictim(), SPELL_FROSTBOLT); + DoCast(me->GetVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 3500; } else Frostbolt_Timer -= diff; @@ -90,7 +90,7 @@ public: if (IceTomb_Timer <= diff) { if (rand()%100 < 65) - DoCast(me->getVictim(), SPELL_ICETOMB); + DoCast(me->GetVictim(), SPELL_ICETOMB); IceTomb_Timer = 28000; } else IceTomb_Timer -= diff; @@ -98,7 +98,7 @@ public: if (DrainLife_Timer <= diff) { if (rand()%100 < 55) - DoCast(me->getVictim(), SPELL_DRAINLIFE); + DoCast(me->GetVictim(), SPELL_DRAINLIFE); DrainLife_Timer = 31000; } else DrainLife_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 2cc16bc2972..690b3035da3 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -92,7 +92,7 @@ public: //EncasingWebs if (EncasingWebs_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ENCASINGWEBS); + DoCast(me->GetVictim(), SPELL_ENCASINGWEBS); EncasingWebs_Timer = 30000; } else EncasingWebs_Timer -= diff; @@ -100,21 +100,21 @@ public: if (PierceArmor_Timer <= diff) { if (urand(0, 3) < 2) - DoCast(me->getVictim(), SPELL_PIERCEARMOR); + DoCast(me->GetVictim(), SPELL_PIERCEARMOR); PierceArmor_Timer = 35000; } else PierceArmor_Timer -= diff; //CryptScarabs_Timer if (CryptScarabs_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CRYPT_SCARABS); + DoCast(me->GetVictim(), SPELL_CRYPT_SCARABS); CryptScarabs_Timer = 20000; } else CryptScarabs_Timer -= diff; //RaiseUndeadScarab if (RaiseUndeadScarab_Timer <= diff) { - RaiseUndeadScarab(me->getVictim()); + RaiseUndeadScarab(me->GetVictim()); RaiseUndeadScarab_Timer = 16000; } else RaiseUndeadScarab_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 5cd69f561d6..a0cfb383872 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -98,7 +98,7 @@ public: //Knockout if (Knockout_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKOUT); + DoCast(me->GetVictim(), SPELL_KNOCKOUT); Knockout_Timer = 10000; } else Knockout_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index 27249e84892..dc2a8188ea9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -78,7 +78,7 @@ public: if (RavenousClaw_Timer <= diff) { //Cast - DoCast(me->getVictim(), SPELL_RAVENOUSCLAW); + DoCast(me->GetVictim(), SPELL_RAVENOUSCLAW); //15 seconds until we should cast this again RavenousClaw_Timer = 15000; } else RavenousClaw_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index bd92617fe84..98ea4a19cbc 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -273,7 +273,7 @@ class instance_stratholme : public InstanceMapScript for (std::set<uint64>::const_iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i) { if (Creature* pAbom = instance->GetCreature(*i)) - if (!pAbom->isAlive()) + if (!pAbom->IsAlive()) --count; } @@ -310,7 +310,7 @@ class instance_stratholme : public InstanceMapScript Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index f12a9c33ea9..396efc4bc7e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -60,7 +60,7 @@ public: { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* pGroupie = itr->getSource(); + Player* pGroupie = itr->GetSource(); if (!pGroupie) continue; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 24c9a692a84..1e800c617bf 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -306,14 +306,14 @@ public: if (SlashTimer <= diff) { - DoCast(me->getVictim(), SPELL_METEOR_SLASH); + DoCast(me->GetVictim(), SPELL_METEOR_SLASH); SlashTimer = 11000; } else SlashTimer -= diff; if (StompTimer <= diff) { Talk(YELL_LOVE); - DoCast(me->getVictim(), SPELL_STOMP); + DoCast(me->GetVictim(), SPELL_STOMP); StompTimer = 30000; } else StompTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index eb2e4f1ae8b..35b48aaea70 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -118,12 +118,12 @@ public: { if (temp->isDead()) temp->Respawn(); - else if (temp->getVictim()) - me->getThreatManager().addThreat(temp->getVictim(), 0.0f); + else if (temp->GetVictim()) + me->getThreatManager().addThreat(temp->GetVictim(), 0.0f); } } - if (!me->isInCombat()) + if (!me->IsInCombat()) { ShadowbladesTimer = 10000; ShadownovaTimer = 30000; @@ -146,7 +146,7 @@ public: if (instance) { Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ALYTHESS)); - if (temp && temp->isAlive() && !temp->getVictim()) + if (temp && temp->IsAlive() && !temp->GetVictim()) temp->AI()->AttackStart(who); } @@ -324,10 +324,10 @@ public: if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false)) { //If we are within range melee the target - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - HandleTouchedSpells(me->getVictim(), SPELL_DARK_TOUCHED); - me->AttackerStateUpdate(me->getVictim()); + HandleTouchedSpells(me->GetVictim(), SPELL_DARK_TOUCHED); + me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } } @@ -380,12 +380,12 @@ public: { if (temp->isDead()) temp->Respawn(); - else if (temp->getVictim()) - me->getThreatManager().addThreat(temp->getVictim(), 0.0f); + else if (temp->GetVictim()) + me->getThreatManager().addThreat(temp->GetVictim(), 0.0f); } } - if (!me->isInCombat()) + if (!me->IsInCombat()) { ConflagrationTimer = 45000; BlazeTimer = 100; @@ -409,7 +409,7 @@ public: if (instance) { Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_SACROLASH)); - if (temp && temp->isAlive() && !temp->getVictim()) + if (temp && temp->IsAlive() && !temp->GetVictim()) temp->AI()->AttackStart(who); } @@ -419,21 +419,21 @@ public: void AttackStart(Unit* who) { - if (!me->isInCombat()) + if (!me->IsInCombat()) ScriptedAI::AttackStart(who); } void MoveInLineOfSight(Unit* who) { - if (!who || me->getVictim()) + if (!who || me->GetVictim()) return; - if (me->canCreatureAttack(who)) + if (me->CanCreatureAttack(who)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && me->IsWithinLOSInMap(who)) { - if (!me->isInCombat()) + if (!me->IsInCombat()) { DoStartNoMovement(who); } @@ -567,16 +567,16 @@ public: } } } - if (!me->getVictim()) + if (!me->GetVictim()) { if (instance) { Creature* sisiter = Unit::GetCreature((*me), instance->GetData64(DATA_SACROLASH)); - if (sisiter && !sisiter->isDead() && sisiter->getVictim()) + if (sisiter && !sisiter->isDead() && sisiter->GetVictim()) { - me->AddThreat(sisiter->getVictim(), 0.0f); - DoStartNoMovement(sisiter->getVictim()); - me->Attack(sisiter->getVictim(), false); + me->AddThreat(sisiter->GetVictim(), 0.0f); + DoStartNoMovement(sisiter->GetVictim()); + me->Attack(sisiter->GetVictim(), false); } } } @@ -645,7 +645,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - DoCast(me->getVictim(), SPELL_BLAZE); + DoCast(me->GetVictim(), SPELL_BLAZE); BlazeTimer = 3800; } } else BlazeTimer -= diff; @@ -732,8 +732,8 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { //If we are within range melee the target - if (me->IsWithinMeleeRange(me->getVictim())) - DoCast(me->getVictim(), SPELL_DARK_STRIKE); + if (me->IsWithinMeleeRange(me->GetVictim())) + DoCast(me->GetVictim(), SPELL_DARK_STRIKE); } DarkstrikeTimer = 3000; } else DarkstrikeTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 6ac6b9a4812..ea8509ffc7c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -428,11 +428,11 @@ public: events.ScheduleEvent(EVENT_BERSERK, 10000); break; case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE, false); + DoCast(me->GetVictim(), SPELL_CLEAVE, false); events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000)); break; case EVENT_CORROSION: - DoCast(me->getVictim(), SPELL_CORROSION, false); + DoCast(me->GetVictim(), SPELL_CORROSION, false); events.ScheduleEvent(EVENT_CORROSION, urand(20000, 30000)); break; case EVENT_GAS_NOVA: @@ -538,7 +538,7 @@ public: } void UpdateAI(uint32 /*diff*/) { - if (!me->getVictim()) + if (!me->GetVictim()) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) AttackStart(target); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index b6b701c513d..345112ac48e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -305,7 +305,7 @@ public: Unit* target = (*itr)->getTarget(); if (target && target->GetTypeId() == TYPEID_PLAYER - && target->GetGUID() != me->getVictim()->GetGUID() + && target->GetGUID() != me->GetVictim()->GetGUID() && target->GetPositionZ() > me->GetPositionZ() - 5 && !target->HasAura(AURA_SPECTRAL_EXHAUSTION)) { @@ -335,7 +335,7 @@ public: if (bJustReset)//boss is invisible, don't attack return; - if (!me->getVictim() && me->IsValidAttackTarget(who)) + if (!me->GetVictim() && me->IsValidAttackTarget(who)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius)) @@ -378,7 +378,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (player) me->GetMap()->ToInstanceMap()->PermBindAllPlayers(player); } @@ -528,7 +528,7 @@ public: if (HeroicStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_HEROIC_STRIKE); + DoCast(me->GetVictim(), SPELL_HEROIC_STRIKE); HeroicStrikeTimer = 2000; } else HeroicStrikeTimer -= diff; @@ -552,7 +552,7 @@ public: Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->GetPositionZ() < DEMON_REALM_Z + 5) + if (i->GetSource() && i->GetSource()->GetPositionZ() < DEMON_REALM_Z + 5) ++SpectralPlayers; } uint8 MaxSpectralPlayers = MAX_PLAYERS_IN_SPECTRAL_REALM; @@ -683,10 +683,10 @@ public: Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5) + if (i->GetSource()->GetPositionZ() <= DRAGON_REALM_Z-5) { - i->getSource()->RemoveAura(AURA_SPECTRAL_REALM); - i->getSource()->TeleportTo(me->GetMap()->GetId(), i->getSource()->GetPositionX(), i->getSource()->GetPositionY(), DRAGON_REALM_Z+5, i->getSource()->GetOrientation()); + i->GetSource()->RemoveAura(AURA_SPECTRAL_REALM); + i->GetSource()->TeleportTo(me->GetMap()->GetId(), i->GetSource()->GetPositionX(), i->GetSource()->GetPositionY(), DRAGON_REALM_Z+5, i->GetSource()->GetOrientation()); } } } @@ -716,7 +716,7 @@ public: if (CheckTimer <= diff) { Creature* Kalec = Unit::GetCreature(*me, KalecGUID); - if (!Kalec || !Kalec->isAlive()) + if (!Kalec || !Kalec->IsAlive()) { if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) Kalecgos->AI()->EnterEvadeMode(); @@ -731,7 +731,7 @@ public: } Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID); - if (Kalecgos && !Kalecgos->isInCombat()) + if (Kalecgos && !Kalecgos->IsInCombat()) { me->AI()->EnterEvadeMode(); return; @@ -781,7 +781,7 @@ public: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!target) - target = me->getVictim(); + target = me->GetVictim(); DoCast(target, SPELL_AGONY_CURSE); AgonyCurseTimer = 20000; } else AgonyCurseTimer -= diff; @@ -789,7 +789,7 @@ public: if (CorruptionStrikeTimer <= diff) { if (!(rand()%5))Talk(SAY_SATH_SPELL2); - DoCast(me->getVictim(), SPELL_CORRUPTION_STRIKE); + DoCast(me->GetVictim(), SPELL_CORRUPTION_STRIKE); CorruptionStrikeTimer = 13000; } else CorruptionStrikeTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index a6aa9457551..e493abf936d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -448,7 +448,7 @@ public: break; case CREATURE_KILJAEDEN: summoned->CastSpell(summoned, SPELL_REBIRTH, false); - summoned->AddThreat(me->getVictim(), 1.0f); + summoned->AddThreat(me->GetVictim(), 1.0f); break; } summons.Summon(summoned); @@ -725,8 +725,8 @@ public: case TIMER_SOUL_FLAY: if (!me->IsNonMeleeSpellCasted(false)) { - DoCast(me->getVictim(), SPELL_SOUL_FLAY_SLOW, false); - DoCast(me->getVictim(), SPELL_SOUL_FLAY, false); + DoCast(me->GetVictim(), SPELL_SOUL_FLAY_SLOW, false); + DoCast(me->GetVictim(), SPELL_SOUL_FLAY, false); Timer[TIMER_SOUL_FLAY] = 3500; } break; @@ -953,7 +953,7 @@ public: void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) DoCast(me, SPELL_SHADOW_CHANNELING); if (!UpdateVictim()) @@ -966,7 +966,7 @@ public: // Shadow Bolt Volley - Shoots Shadow Bolts at all enemies within 30 yards, for ~2k Shadow damage. if (ShadowBoltVolleyTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT_VOLLEY); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT_VOLLEY); ShadowBoltVolleyTimer = 12000; } else @@ -1078,7 +1078,7 @@ public: if (!bLockedTarget) { - me->AddThreat(me->getVictim(), 10000000.0f); + me->AddThreat(me->GetVictim(), 10000000.0f); bLockedTarget = true; } @@ -1088,9 +1088,9 @@ public: uiExplodeTimer = 0; else uiExplodeTimer -= diff; } - else if (me->IsWithinDistInMap(me->getVictim(), 3)) // Explode if it's close enough to it's target + else if (me->IsWithinDistInMap(me->GetVictim(), 3)) // Explode if it's close enough to it's target { - DoCast(me->getVictim(), SPELL_FELFIRE_FISSION); + DoCast(me->GetVictim(), SPELL_FELFIRE_FISSION); me->Kill(me); } } @@ -1272,9 +1272,9 @@ public: if (!UpdateVictim()) return; - if ((victimClass == 0) && me->getVictim()) + if ((victimClass == 0) && me->GetVictim()) { - victimClass = me->getVictim()->getClass(); + victimClass = me->GetVictim()->getClass(); switch (victimClass) { case CLASS_DRUID: @@ -1306,7 +1306,7 @@ public: case CLASS_DRUID: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_MOONFIRE, false); + DoCast(me->GetVictim(), SPELL_SR_MOONFIRE, false); uiTimer[1] = urand(2000, 4000); } DoMeleeAttackIfReady(); @@ -1314,19 +1314,19 @@ public: case CLASS_HUNTER: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_MULTI_SHOT, false); + DoCast(me->GetVictim(), SPELL_SR_MULTI_SHOT, false); uiTimer[1] = urand(8000, 10000); } if (uiTimer[2] <= diff) { - DoCast(me->getVictim(), SPELL_SR_SHOOT, false); + DoCast(me->GetVictim(), SPELL_SR_SHOOT, false); uiTimer[2] = urand(4000, 6000); } - if (me->IsWithinMeleeRange(me->getVictim(), 6)) + if (me->IsWithinMeleeRange(me->GetVictim(), 6)) { if (uiTimer[0] <= diff) { - DoCast(me->getVictim(), SPELL_SR_MULTI_SHOT, false); + DoCast(me->GetVictim(), SPELL_SR_MULTI_SHOT, false); uiTimer[0] = urand(6000, 8000); } DoMeleeAttackIfReady(); @@ -1335,7 +1335,7 @@ public: case CLASS_MAGE: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_FIREBALL, false); + DoCast(me->GetVictim(), SPELL_SR_FIREBALL, false); uiTimer[1] = urand(2000, 4000); } DoMeleeAttackIfReady(); @@ -1343,7 +1343,7 @@ public: case CLASS_WARLOCK: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_SHADOW_BOLT, false); + DoCast(me->GetVictim(), SPELL_SR_SHADOW_BOLT, false); uiTimer[1] = urand(3000, 5000); } if (uiTimer[2] <= diff) @@ -1356,7 +1356,7 @@ public: case CLASS_WARRIOR: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_WHIRLWIND, false); + DoCast(me->GetVictim(), SPELL_SR_WHIRLWIND, false); uiTimer[1] = urand(9000, 11000); } DoMeleeAttackIfReady(); @@ -1364,12 +1364,12 @@ public: case CLASS_PALADIN: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_HAMMER_OF_JUSTICE, false); + DoCast(me->GetVictim(), SPELL_SR_HAMMER_OF_JUSTICE, false); uiTimer[1] = urand(6000, 8000); } if (uiTimer[2] <= diff) { - DoCast(me->getVictim(), SPELL_SR_HOLY_SHOCK, false); + DoCast(me->GetVictim(), SPELL_SR_HOLY_SHOCK, false); uiTimer[2] = urand(2000, 4000); } DoMeleeAttackIfReady(); @@ -1377,7 +1377,7 @@ public: case CLASS_PRIEST: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_HOLY_SMITE, false); + DoCast(me->GetVictim(), SPELL_SR_HOLY_SMITE, false); uiTimer[1] = urand(4000, 6000); } if (uiTimer[2] <= diff) @@ -1390,7 +1390,7 @@ public: case CLASS_SHAMAN: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_EARTH_SHOCK, false); + DoCast(me->GetVictim(), SPELL_SR_EARTH_SHOCK, false); uiTimer[1] = urand(4000, 6000); } DoMeleeAttackIfReady(); @@ -1398,7 +1398,7 @@ public: case CLASS_ROGUE: if (uiTimer[1] <= diff) { - DoCast(me->getVictim(), SPELL_SR_HEMORRHAGE, true); + DoCast(me->GetVictim(), SPELL_SR_HEMORRHAGE, true); uiTimer[1] = urand(4000, 6000); } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index aa4acc24bfd..9766e9189b5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -501,7 +501,7 @@ public: } else { - if (me->IsWithinDist(me->getVictim(), 5)) + if (me->IsWithinDist(me->GetVictim(), 5)) { DoCastAOE(SPELL_DARKFIEND_AOE, false); me->DisappearAndDie(); @@ -559,7 +559,7 @@ public: if (VoidBlastTimer <= diff) { - DoCast(me->getVictim(), SPELL_VOID_BLAST, false); + DoCast(me->GetVictim(), SPELL_VOID_BLAST, false); VoidBlastTimer = 45000; } else VoidBlastTimer -= diff; @@ -630,7 +630,7 @@ public: case 3: SpellTimer = urand(400, 900); NeedForAHack = 1; - if (Unit* Temp = me->getVictim()) + if (Unit* Temp = me->GetVictim()) { if (Temp->GetPositionZ() > 73 && Victim) AttackStart(Victim); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index cc3f48b72df..050275bc94c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -130,7 +130,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); + Player* player = itr->GetSource(); if (player && !player->HasAura(45839, 0)) return player; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index ec9409af69f..30182f00ccb 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -97,7 +97,7 @@ class boss_archaedas : public CreatureScript { Unit* minion = Unit::GetUnit(*me, uiGuid); - if (minion && minion->isAlive()) + if (minion && minion->IsAlive()) { DoCast(minion, SPELL_AWAKEN_VAULT_WALKER, flag); minion->CastSpell(minion, SPELL_ARCHAEDAS_AWAKEN, true); @@ -185,7 +185,7 @@ class boss_archaedas : public CreatureScript if (uiTremorTimer <= uiDiff) { //Cast - DoCast(me->getVictim(), SPELL_GROUND_TREMOR); + DoCast(me->GetVictim(), SPELL_GROUND_TREMOR); //45 seconds until we should cast this agian uiTremorTimer = 45000; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index f40570d4130..126745fccfe 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -72,12 +72,12 @@ class boss_ironaya : public CreatureScript //If we are <50% hp do knockaway ONCE if (!bHasCastedKnockaway && HealthBelowPct(50)) { - DoCast(me->getVictim(), SPELL_KNOCKAWAY, true); + DoCast(me->GetVictim(), SPELL_KNOCKAWAY, true); // current aggro target is knocked away pick new target Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (!target || target == me->getVictim()) + if (!target || target == me->GetVictim()) target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (target) diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index df87eaca5a8..016b0aad62d 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -179,7 +179,7 @@ class instance_uldaman : public InstanceMapScript for (std::vector<uint64>::const_iterator i = stoneKeepers.begin(); i != stoneKeepers.end(); ++i) { Creature* target = instance->GetCreature(*i); - if (!target || !target->isAlive()) + if (!target || !target->IsAlive()) continue; target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); target->setFaction(14); @@ -201,7 +201,7 @@ class instance_uldaman : public InstanceMapScript for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { Creature* target = instance->GetCreature(*i); - if (!target || !target->isAlive() || target->getFaction() == 14) + if (!target || !target->IsAlive() || target->getFaction() == 14) continue; archaedas->CastSpell(target, SPELL_AWAKEN_VAULT_WALKER, true); target->CastSpell(target, SPELL_ARCHAEDAS_AWAKEN, true); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 9fdc2f26d9f..250e41aebd3 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -85,7 +85,7 @@ class mob_jadespine_basilisk : public CreatureScript Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (!target || target == me->getVictim()) + if (!target || target == me->GetVictim()) target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (target) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index ce526fb0ddc..20d3df4b17f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -153,7 +153,7 @@ class boss_akilzon : public CreatureScript for (uint8 i = 0; i < 8; ++i) { Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); - if (bird && bird->isAlive()) + if (bird && bird->IsAlive()) { bird->SetVisible(false); bird->setDeathState(JUST_DIED); @@ -248,7 +248,7 @@ class boss_akilzon : public CreatureScript if (StormCount) { Unit* target = Unit::GetUnit(*me, CloudGUID); - if (!target || !target->isAlive()) + if (!target || !target->IsAlive()) { EnterEvadeMode(); return; @@ -274,10 +274,10 @@ class boss_akilzon : public CreatureScript if (StaticDisruption_Timer <= diff) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!target) target = me->getVictim(); + if (!target) target = me->GetVictim(); TargetGUID = target->GetGUID(); DoCast(target, SPELL_STATIC_DISRUPTION, false); - me->SetInFront(me->getVictim()); + me->SetInFront(me->GetVictim()); StaticDisruption_Timer = (10+rand()%8)*1000; // < 20s /*if (float dist = me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f; @@ -287,14 +287,14 @@ class boss_akilzon : public CreatureScript if (GustOfWind_Timer <= diff) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!target) target = me->getVictim(); + if (!target) target = me->GetVictim(); DoCast(target, SPELL_GUST_OF_WIND); GustOfWind_Timer = urand(20, 30) * 1000; //20 to 30 seconds(bosskillers) } else GustOfWind_Timer -= diff; if (CallLighting_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CALL_LIGHTNING); + DoCast(me->GetVictim(), SPELL_CALL_LIGHTNING); CallLighting_Timer = urand(12, 17) * 1000; //totaly random timer. can't find any info on this } else CallLighting_Timer -= diff; @@ -361,8 +361,8 @@ class boss_akilzon : public CreatureScript Creature* creature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (creature) { - creature->AddThreat(me->getVictim(), 1.0f); - creature->AI()->AttackStart(me->getVictim()); + creature->AddThreat(me->GetVictim(), 1.0f); + creature->AI()->AttackStart(me->GetVictim()); BirdGUIDs[i] = creature->GetGUID(); } } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 21392fda660..60e25af862b 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -138,7 +138,7 @@ class boss_halazzi : public CreatureScript void JustSummoned(Creature* summon) { - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); if (summon->GetEntry() == NPC_SPIRIT_LYNX) LynxGUID = summon->GetGUID(); } @@ -169,8 +169,8 @@ class boss_halazzi : public CreatureScript if (Phase == PHASE_MERGE) { DoCast(me, SPELL_TRANSFORM_MERGE, true); - me->Attack(me->getVictim(), true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->Attack(me->GetVictim(), true); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } if (Creature* Lynx = Unit::GetCreature(*me, LynxGUID)) Lynx->DisappearAndDie(); @@ -232,7 +232,7 @@ class boss_halazzi : public CreatureScript { // A tank with more than 490 defense skills should receive no critical hit //DoCast(me, 41296, true); - DoCast(me->getVictim(), SPELL_SABER_LASH, true); + DoCast(me->GetVictim(), SPELL_SABER_LASH, true); //me->RemoveAurasDueToSpell(41296); SaberlashTimer = 30000; } else SaberlashTimer -= diff; @@ -397,7 +397,7 @@ class mob_halazzi_lynx : public CreatureScript if (shredder_timer <= diff) { - DoCast(me->getVictim(), SPELL_SHRED_ARMOR); + DoCast(me->GetVictim(), SPELL_SHRED_ARMOR); shredder_timer = 4000; } else shredder_timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 6fa7e94e55e..195e21ca102 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -275,8 +275,8 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4; ++i) { Creature* creature = Unit::GetCreature(*me, AddGUID[i]); - if (creature && creature->isAlive()) - creature->AI()->AttackStart(me->getVictim()); + if (creature && creature->IsAlive()) + creature->AI()->AttackStart(me->GetVictim()); else { EnterEvadeMode(); @@ -311,7 +311,7 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4; ++i) { Unit* Temp = Unit::GetUnit(*me, AddGUID[i]); - if (Temp && Temp->isAlive()) + if (Temp && Temp->IsAlive()) Temp->DealDamage(Temp, Temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } @@ -336,7 +336,7 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4; ++i) { Creature* creature = (Unit::GetCreature((*me), AddGUID[i])); - if (!creature || !creature->isAlive()) + if (!creature || !creature->IsAlive()) { if (creature) creature->setDeathState(DEAD); creature = me->SummonCreature(AddEntry[i], Pos_X[i], POS_Y, POS_Z, ORIENT, TEMPSUMMON_DEAD_DESPAWN, 0); @@ -370,8 +370,8 @@ class boss_hexlord_malacrass : public CreatureScript { for (uint8 i = 0; i < 4; ++i) if (Creature* temp = Unit::GetCreature(*me, AddGUID[i])) - if (temp->isAlive() && !temp->getVictim()) - temp->AI()->AttackStart(me->getVictim()); + if (temp->IsAlive() && !temp->GetVictim()) + temp->AI()->AttackStart(me->GetVictim()); CheckAddState_Timer = 5000; } else CheckAddState_Timer -= diff; @@ -435,7 +435,7 @@ class boss_hexlord_malacrass : public CreatureScript if (PlayerAbility_Timer <= diff) { //Unit* target = Unit::GetUnit(*me, PlayerGUID); - //if (target && target->isAlive()) + //if (target && target->IsAlive()) //{ UseAbility(); PlayerAbility_Timer = urand(8000, 10000); @@ -455,7 +455,7 @@ class boss_hexlord_malacrass : public CreatureScript target = me; break; case ABILITY_TARGET_VICTIM: - target = me->getVictim(); + target = me->GetVictim(); break; case ABILITY_TARGET_ENEMY: default: @@ -529,7 +529,7 @@ class boss_thurg : public CreatureScript if (cleave_timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE, false); + DoCast(me->GetVictim(), SPELL_CLEAVE, false); cleave_timer = 12000; //3 sec cast } else cleave_timer -= diff; @@ -679,7 +679,7 @@ struct boss_gazakrothAI : public boss_hexlord_addAI if (firebolt_timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBOLT, false); + DoCast(me->GetVictim(), SPELL_FIREBOLT, false); firebolt_timer = 700; } else firebolt_timer -= diff; @@ -721,13 +721,13 @@ class boss_lord_raadan : public CreatureScript if (thunderclap_timer <= diff) { - DoCast(me->getVictim(), SPELL_THUNDERCLAP, false); + DoCast(me->GetVictim(), SPELL_THUNDERCLAP, false); thunderclap_timer = 12000; } else thunderclap_timer -= diff; if (flamebreath_timer <= diff) { - DoCast(me->getVictim(), SPELL_FLAME_BREATH, false); + DoCast(me->GetVictim(), SPELL_FLAME_BREATH, false); flamebreath_timer = 12000; } else flamebreath_timer -= diff; @@ -770,7 +770,7 @@ class boss_darkheart : public CreatureScript if (psychicwail_timer <= diff) { - DoCast(me->getVictim(), SPELL_PSYCHIC_WAIL, false); + DoCast(me->GetVictim(), SPELL_PSYCHIC_WAIL, false); psychicwail_timer = 12000; } else psychicwail_timer -= diff; @@ -875,7 +875,7 @@ class boss_fenstalker : public CreatureScript if (volatileinf_timer <= diff) { // core bug - me->getVictim()->CastSpell(me->getVictim(), SPELL_VOLATILE_INFECTION, false); + me->GetVictim()->CastSpell(me->GetVictim(), SPELL_VOLATILE_INFECTION, false); volatileinf_timer = 12000; } else volatileinf_timer -= diff; @@ -923,7 +923,7 @@ class boss_koragg : public CreatureScript if (mightyblow_timer <= diff) { - DoCast(me->getVictim(), SPELL_MIGHTY_BLOW, false); + DoCast(me->GetVictim(), SPELL_MIGHTY_BLOW, false); mightyblow_timer = 12000; } if (coldstare_timer <= diff) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 81d47148b23..51645b07158 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -381,8 +381,8 @@ class boss_janalai : public CreatureScript Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* i_pl = i->getSource()) - if (i_pl->isAlive()) + if (Player* i_pl = i->GetSource()) + if (i_pl->IsAlive()) DoTeleportPlayer(i_pl, JanalainPos[0][0]-5+rand()%10, JanalainPos[0][1]-5+rand()%10, JanalainPos[0][2], 0); //DoCast(Temp, SPELL_SUMMON_PLAYERS, true) // core bug, spell does not work if too far return; @@ -654,7 +654,7 @@ class mob_janalai_hatchling : public CreatureScript if (BuffetTimer <= diff) { - DoCast(me->getVictim(), SPELL_FLAMEBUFFET, false); + DoCast(me->GetVictim(), SPELL_FLAMEBUFFET, false); BuffetTimer = 10000; } else BuffetTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 6c8b1cd8aba..e8e72fe9e10 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -398,15 +398,15 @@ class boss_nalorakk : public CreatureScript { if (BrutalSwipe_Timer <= diff) { - DoCast(me->getVictim(), SPELL_BRUTALSWIPE); + DoCast(me->GetVictim(), SPELL_BRUTALSWIPE); BrutalSwipe_Timer = urand(7000, 12000); } else BrutalSwipe_Timer -= diff; if (Mangle_Timer <= diff) { - if (me->getVictim() && !me->getVictim()->HasAura(SPELL_MANGLEEFFECT)) + if (me->GetVictim() && !me->GetVictim()->HasAura(SPELL_MANGLEEFFECT)) { - DoCast(me->getVictim(), SPELL_MANGLE); + DoCast(me->GetVictim(), SPELL_MANGLE); Mangle_Timer = 1000; } else Mangle_Timer = urand(10000, 15000); @@ -426,19 +426,19 @@ class boss_nalorakk : public CreatureScript { if (LaceratingSlash_Timer <= diff) { - DoCast(me->getVictim(), SPELL_LACERATINGSLASH); + DoCast(me->GetVictim(), SPELL_LACERATINGSLASH); LaceratingSlash_Timer = urand(18000, 23000); } else LaceratingSlash_Timer -= diff; if (RendFlesh_Timer <= diff) { - DoCast(me->getVictim(), SPELL_RENDFLESH); + DoCast(me->GetVictim(), SPELL_RENDFLESH); RendFlesh_Timer = urand(5000, 10000); } else RendFlesh_Timer -= diff; if (DeafeningRoar_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DEAFENINGROAR); + DoCast(me->GetVictim(), SPELL_DEAFENINGROAR); DeafeningRoar_Timer = urand(15000, 20000); } else DeafeningRoar_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index be88e67386b..9a3fbd0358f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -248,18 +248,18 @@ class boss_zuljin : public CreatureScript { if (!me->IsNonMeleeSpellCasted(false)) { - if (me->isAttackReady() && me->IsWithinMeleeRange(me->getVictim())) + if (me->isAttackReady() && me->IsWithinMeleeRange(me->GetVictim())) { if (Phase == 1 && !Overpower_Timer) { - uint32 health = me->getVictim()->GetHealth(); - me->AttackerStateUpdate(me->getVictim()); - if (me->getVictim() && health == me->getVictim()->GetHealth()) + uint32 health = me->GetVictim()->GetHealth(); + me->AttackerStateUpdate(me->GetVictim()); + if (me->GetVictim() && health == me->GetVictim()->GetHealth()) { - DoCast(me->getVictim(), SPELL_OVERPOWER, false); + DoCast(me->GetVictim(), SPELL_OVERPOWER, false); Overpower_Timer = 5000; } - } else me->AttackerStateUpdate(me->getVictim()); + } else me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } } @@ -349,12 +349,12 @@ class boss_zuljin : public CreatureScript } } else - me->AI()->AttackStart(me->getVictim()); + me->AI()->AttackStart(me->GetVictim()); if (NextPhase == 3) { me->RemoveAurasDueToSpell(SPELL_ENERGY_STORM); Summons.DespawnEntry(CREATURE_FEATHER_VORTEX); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } break; default: @@ -431,7 +431,7 @@ class boss_zuljin : public CreatureScript { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - TankGUID = me->getVictim()->GetGUID(); + TankGUID = me->GetVictim()->GetGUID(); me->SetSpeed(MOVE_RUN, 5.0f); AttackStart(target); // change victim Claw_Rage_Timer = 0; @@ -443,7 +443,7 @@ class boss_zuljin : public CreatureScript { if (Claw_Loop_Timer <= diff) { - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); if (!target || !target->isTargetableForAttack()) target = Unit::GetUnit(*me, TankGUID); if (!target || !target->isTargetableForAttack()) target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (target) @@ -480,7 +480,7 @@ class boss_zuljin : public CreatureScript { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - TankGUID = me->getVictim()->GetGUID(); + TankGUID = me->GetVictim()->GetGUID(); me->SetSpeed(MOVE_RUN, 5.0f); AttackStart(target); // change victim Lynx_Rush_Timer = 0; @@ -489,7 +489,7 @@ class boss_zuljin : public CreatureScript } else if (!Lynx_Rush_Timer) { - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); if (!target || !target->isTargetableForAttack()) { target = SelectTarget(SELECT_TARGET_RANDOM, 0); @@ -585,7 +585,7 @@ class mob_zuljin_vortex : public CreatureScript void UpdateAI(uint32 /*diff*/) { //if the vortex reach the target, it change his target to another player - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 44b1732f1a9..c8409805a36 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -182,7 +182,7 @@ class instance_zulaman : public InstanceMapScript return; Map::PlayerList::const_iterator i = PlayerList.begin(); - if (Player* i_pl = i->getSource()) + if (Player* i_pl = i->GetSource()) { if (Unit* Hostage = i_pl->SummonCreature(HostageInfo[num].npc, HostageInfo[num].x, HostageInfo[num].y, HostageInfo[num].z, HostageInfo[num].o, TEMPSUMMON_DEAD_DESPAWN, 0)) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 116fd18e458..d7949e01184 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -403,7 +403,7 @@ class npc_chained_spirit : public CreatureScript void JustDied(Unit* /*killer*/) { Player* target = ObjectAccessor::GetPlayer(*me, _revivePlayerGUID); - if (!target || target->isAlive()) + if (!target || target->IsAlive()) return; if (Creature* mandokir = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_MANDOKIR))) @@ -569,7 +569,7 @@ class spell_mandokir_devastating_slam : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(DevastatingSlamTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); + targets.remove_if(DevastatingSlamTargetSelector(GetCaster()->ToCreature(), GetCaster()->GetVictim())); if (targets.empty()) return; diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 5bfb5edadc1..d2143af2252 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -122,13 +122,13 @@ public: return; if (SoulCorruption_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SOUL_CORRUPTION); + DoCast(me->GetVictim(), SPELL_SOUL_CORRUPTION); SoulCorruption_Timer = rand()%4000+15000; //gotta confirm Timers } else SoulCorruption_Timer-=diff; if (CreatureOfNightmare_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CREATURE_OF_NIGHTMARE); + DoCast(me->GetVictim(), SPELL_CREATURE_OF_NIGHTMARE); CreatureOfNightmare_Timer = 45000; //gotta confirm Timers } else CreatureOfNightmare_Timer-=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index a2522fd9495..4e04307d154 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -81,10 +81,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor() && player->GetQuestRewardStatus(6164)) + if (creature->IsVendor() && player->GetQuestRewardStatus(6164)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -171,7 +171,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && player->getStandState() == UNIT_STAND_STATE_SIT) diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 1a9aabcda57..23e67b63a1a 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -54,15 +54,16 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor() && player->GetQuestRewardStatus(9152)) + if (creature->IsVendor() && player->GetQuestRewardStatus(9152)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(8432, creature->GetGUID()); - }else - player->SEND_GOSSIP_MENU(8431, creature->GetGUID()); + } + else + player->SEND_GOSSIP_MENU(8431, creature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index 45f5e17095f..8f7a6b68932 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -80,7 +80,7 @@ public: Talk(SAY_CONVERTED); DoCast(me, SPELL_CONVERT_CREDIT); - if (me->isPet()) + if (me->IsPet()) me->ToPet()->SetDuration(7500); Credit = true; } else Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 66fb4819175..5a67f0d053a 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -98,9 +98,9 @@ public: Reset_Timer -= diff; - if (me->isInCombat() && me->getVictim()) + if (me->IsInCombat() && me->GetVictim()) { - if (Player* player = me->getVictim()->ToPlayer()) + if (Player* player = me->GetVictim()->ToPlayer()) { if (player->GetTeam() == HORDE) { diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 43ee012ef40..892402251dc 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -172,7 +172,7 @@ public: DoCast(me, SPELL_FADE_BLINK); FadeTimer = 30000 + rand()%5000; // if the victim is out of melee range she cast multi shot - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) if (me->GetDistance(victim) > 10.0f) DoCast(victim, SPELL_MULTI_SHOT); } else FadeTimer -= diff; @@ -185,7 +185,7 @@ public: if (BlackArrowTimer <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { DoCast(victim, SPELL_BLACK_ARROW); BlackArrowTimer = 15000 + rand()%5000; @@ -194,7 +194,7 @@ public: if (ShotTimer <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { DoCast(victim, SPELL_SHOT); ShotTimer = 8000 + rand()%2000; @@ -203,7 +203,7 @@ public: if (MultiShotTimer <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { DoCast(victim, SPELL_MULTI_SHOT); MultiShotTimer = 10000 + rand()%3000; @@ -305,7 +305,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !player->HasAura(SPELL_MARK_OF_SHAME)) diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 0692330b87a..1e099a07844 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -87,10 +87,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (player->GetQuestRewardStatus(5237) || player->GetQuestRewardStatus(5238)) @@ -139,7 +139,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE && diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 1b93cf1be71..9ca880a1261 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -187,8 +187,8 @@ public: { uiShootTimer = 1500; - if (!me->IsWithinDist(me->getVictim(), ATTACK_DISTANCE)) - DoCast(me->getVictim(), SPELL_SHOOT); + if (!me->IsWithinDist(me->GetVictim(), ATTACK_DISTANCE)) + DoCast(me->GetVictim(), SPELL_SHOOT); } else uiShootTimer -= diff; } }; diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index ea7b995e8cf..faaeeaea8bd 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -101,7 +101,7 @@ public: void AttackedBy(Unit* pAttacker) { - if (me->getVictim()) + if (me->GetVictim()) return; if (me->IsFriendlyTo(pAttacker)) diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index d4e1b8d8ce2..6a6c348bfcf 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -168,7 +168,7 @@ class example_creature : public CreatureScript void UpdateAI(uint32 uiDiff) { //Out of combat timers - if (!me->getVictim()) + if (!me->GetVictim()) { //Random Say timer if (m_uiSayTimer <= uiDiff) @@ -200,9 +200,9 @@ class example_creature : public CreatureScript { //Cast spell one on our current target. if (rand()%50 > 10) - DoCast(me->getVictim(), SPELL_ONE_ALT); - else if (me->IsWithinDist(me->getVictim(), 25.0f)) - DoCast(me->getVictim(), SPELL_ONE); + DoCast(me->GetVictim(), SPELL_ONE_ALT); + else if (me->IsWithinDist(me->GetVictim(), 25.0f)) + DoCast(me->GetVictim(), SPELL_ONE); m_uiSpell1Timer = 5000; } @@ -213,7 +213,7 @@ class example_creature : public CreatureScript if (m_uiSpell2Timer <= uiDiff) { //Cast spell two on our current target. - DoCast(me->getVictim(), SPELL_TWO); + DoCast(me->GetVictim(), SPELL_TWO); m_uiSpell2Timer = 37000; } else @@ -226,7 +226,7 @@ class example_creature : public CreatureScript if (m_uiSpell3Timer <= uiDiff) { //Cast spell one on our current target. - DoCast(me->getVictim(), SPELL_THREE); + DoCast(me->GetVictim(), SPELL_THREE); m_uiSpell3Timer = 19000; } @@ -236,8 +236,8 @@ class example_creature : public CreatureScript if (m_uiBeserkTimer <= uiDiff) { //Say our line then cast uber death spell - Talk(SAY_BERSERK, me->getVictim() ? me->getVictim()->GetGUID() : 0); - DoCast(me->getVictim(), SPELL_BERSERK); + Talk(SAY_BERSERK, me->GetVictim() ? me->GetVictim()->GetGUID() : 0); + DoCast(me->GetVictim(), SPELL_BERSERK); //Cast our beserk spell agian in 12 seconds if we didn't kill everyone m_uiBeserkTimer = 12000; diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index e911736036c..bf3daa1443f 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -142,12 +142,12 @@ class example_escort : public CreatureScript npc_escortAI::UpdateAI(uiDiff); //Combat check - if (me->getVictim()) + if (me->GetVictim()) { if (m_uiDeathCoilTimer <= uiDiff) { Talk(SAY_SPELL); - DoCast(me->getVictim(), SPELL_DEATH_COIL, false); + DoCast(me->GetVictim(), SPELL_DEATH_COIL, false); m_uiDeathCoilTimer = 4000; } else diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index f4f7dc6a23e..81e1136f94f 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -82,7 +82,7 @@ public: { npc_blackfathom_deeps_eventAI(Creature* creature) : ScriptedAI(creature) { - if (creature->isSummon()) + if (creature->IsSummon()) { creature->SetHomePosition(HomePosition); AttackPlayer(); @@ -117,12 +117,12 @@ public: for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { me->SetInCombatWith(player); player->SetInCombatWith(me); @@ -183,7 +183,7 @@ public: void JustDied(Unit* /*killer*/) { - if (me->isSummon()) //we are not a normal spawn. + if (me->IsSummon()) //we are not a normal spawn. if (instance) instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 6a697c3cc9c..f3bfe0b8fbe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -93,7 +93,7 @@ public: if (waypointId == 7 && instance) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -217,7 +217,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsValidAttackTarget(who)) + if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index dcf9605f101..332ac33c56b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -121,7 +121,7 @@ public: { if (Unit* Archimonde = Unit::GetUnit(*me, ArchimondeGUID)) { - if (Archimonde->HealthBelowPct(2) || !Archimonde->isAlive()) + if (Archimonde->HealthBelowPct(2) || !Archimonde->IsAlive()) DoCast(me, SPELL_DENOUEMENT_WISP); else DoCast(Archimonde, SPELL_ANCIENT_SPARK); @@ -355,7 +355,7 @@ public: bool CanUseFingerOfDeath() { // First we check if our current victim is in melee range or not. - Unit* victim = me->getVictim(); + Unit* victim = me->GetVictim(); if (victim && me->IsWithinDistInMap(victim, me->GetAttackDistance(victim))) return false; @@ -368,7 +368,7 @@ public: for (; itr != threatlist.end(); ++itr) { Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) targets.push_back(unit); } @@ -382,7 +382,7 @@ public: if (!me->IsWithinDistInMap(target, me->GetAttackDistance(target))) return true; // Cast Finger of Death else // This target is closest, he is our new tank - me->AddThreat(target, me->getThreatManager().getThreat(me->getVictim())); + me->AddThreat(target, me->getThreatManager().getThreat(me->GetVictim())); } return false; @@ -456,7 +456,7 @@ public: if (me->HasAura(chargeSpell)) { me->RemoveAuraFromStack(chargeSpell); - DoCast(me->getVictim(), unleashSpell); + DoCast(me->GetVictim(), unleashSpell); HasCast = true; SoulChargeCount--; } @@ -467,7 +467,7 @@ public: void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) { if (instance) { @@ -577,7 +577,7 @@ public: { if (HandOfDeathTimer <= diff) { - DoCast(me->getVictim(), SPELL_HAND_OF_DEATH); + DoCast(me->GetVictim(), SPELL_HAND_OF_DEATH); HandOfDeathTimer = 2000; } else HandOfDeathTimer -= diff; return; // Don't do anything after this point. @@ -605,7 +605,7 @@ public: if (FearTimer <= diff) { - DoCast(me->getVictim(), SPELL_FEAR); + DoCast(me->GetVictim(), SPELL_FEAR); FearTimer = 42000; } else FearTimer -= diff; @@ -614,7 +614,7 @@ public: Talk(SAY_DOOMFIRE); Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!temp) - temp = me->getVictim(); + temp = me->GetVictim(); //replace with spell cast 31903 once implicitTarget 73 implemented SummonDoomfire(temp); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 15470716ea7..f47ba2cc3a3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -99,7 +99,7 @@ public: if (waypointId == 7 && instance) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -161,7 +161,7 @@ public: if (CleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); CleaveTimer = 10000+rand()%5000; } else CleaveTimer -= diff; @@ -226,7 +226,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsValidAttackTarget(who)) + if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 0780b3dcf0d..c24eda9b38e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -95,7 +95,7 @@ public: if (waypointId == 7 && instance) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index b35826c9d87..6d9a66c1a64 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -90,7 +90,7 @@ public: if (waypointId == 7 && instance) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -139,13 +139,13 @@ public: } else FrostArmorTimer -= diff; if (DecayTimer <= diff) { - DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); + DoCast(me->GetVictim(), SPELL_DEATH_AND_DECAY); DecayTimer = 60000+rand()%20000; Talk(SAY_DECAY); } else DecayTimer -= diff; if (NovaTimer <= diff) { - DoCast(me->getVictim(), SPELL_FROST_NOVA); + DoCast(me->GetVictim(), SPELL_FROST_NOVA); NovaTimer = 30000+rand()%15000; Talk(SAY_NOVA); } else NovaTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 1544ceee857..8445b4fc6c0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -93,7 +93,7 @@ public: else if (RageEncounter == DONE && AnetheronEncounter == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - if (player->isGameMaster()) + if (player->IsGameMaster()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->SEND_GOSSIP_MENU(907, creature->GetGUID()); @@ -175,7 +175,7 @@ public: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); } - if (player->isGameMaster()) + if (player->IsGameMaster()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->SEND_GOSSIP_MENU(907, creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index a624cd4a4f7..50351aedb5f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -421,7 +421,7 @@ void hyjalAI::EnterEvadeMode() me->CombatStop(true); me->LoadCreaturesAddon(); - if (me->isAlive()) + if (me->IsAlive()) me->GetMotionMaster()->MoveTargetedHome(); me->SetLootRecipient(NULL); @@ -825,7 +825,7 @@ void hyjalAI::UpdateAI(uint32 diff) if (BossGUID[i]) { Unit* unit = Unit::GetUnit(*me, BossGUID[i]); - if (unit && (!unit->isAlive())) + if (unit && (!unit->IsAlive())) { if (BossGUID[i] == BossGUID[0]) { @@ -874,11 +874,11 @@ void hyjalAI::UpdateAI(uint32 diff) break; case TARGETTYPE_VICTIM: - target = me->getVictim(); + target = me->GetVictim(); break; } - if (target && target->isAlive()) + if (target && target->IsAlive()) { DoCast(target, Spells[i].SpellId); SpellTimer[i] = Spells[i].Cooldown; @@ -988,7 +988,7 @@ void hyjalAI::WaypointReached(uint32 waypointId) { for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) { - if ((*itr) && (*itr)->isAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA) + if ((*itr) && (*itr)->IsAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA) { if (!(*itr)->IsWithinDist(me, 60)) (*itr)->SetWalk(false); @@ -1028,7 +1028,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) { for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) { - if ((*itr) && (*itr)->isAlive()) + if ((*itr) && (*itr)->IsAlive()) { (*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true); (*itr)->setFaction(35);//make them friendly so mobs won't attack them diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 87a09749724..9796614d2f2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -191,7 +191,7 @@ hyjal_trashAI::hyjal_trashAI(Creature* creature) : npc_escortAI(creature) void hyjal_trashAI::DamageTaken(Unit* done_by, uint32 &damage) { - if (done_by->GetTypeId() == TYPEID_PLAYER || done_by->isPet()) + if (done_by->GetTypeId() == TYPEID_PLAYER || done_by->IsPet()) { damageTaken += damage; if (instance) @@ -452,7 +452,7 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -493,7 +493,7 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT)) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){ //do overrun @@ -528,7 +528,7 @@ public: } if (FlameBuffetTimer <= diff) { - DoCast(me->getVictim(), SPELL_FLAME_BUFFET, true); + DoCast(me->GetVictim(), SPELL_FLAME_BUFFET, true); FlameBuffetTimer = 7000; } else FlameBuffetTimer -= diff; DoMeleeAttackIfReady(); @@ -574,13 +574,13 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -630,7 +630,7 @@ public: return; if (KnockDownTimer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKDOWN); + DoCast(me->GetVictim(), SPELL_KNOCKDOWN); KnockDownTimer = 15000+rand()%10000; } else KnockDownTimer -= diff; DoMeleeAttackIfReady(); @@ -676,13 +676,13 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -790,13 +790,13 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -858,7 +858,7 @@ public: if (ShadowBoltTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT); ShadowBoltTimer = 20000+rand()%10000; } else ShadowBoltTimer -= diff; @@ -906,13 +906,13 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -952,12 +952,12 @@ public: return; if (CourseTimer <= diff) { - DoCast(me->getVictim(), SPELL_BANSHEE_CURSE); + DoCast(me->GetVictim(), SPELL_BANSHEE_CURSE); CourseTimer = 20000+rand()%5000; } else CourseTimer -= diff; if (WailTimer <= diff) { - DoCast(me->getVictim(), SPELL_BANSHEE_WAIL); + DoCast(me->GetVictim(), SPELL_BANSHEE_WAIL); WailTimer = 15000+rand()%5000; } else WailTimer -= diff; if (ShellTimer <= diff) @@ -1005,13 +1005,13 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -1052,7 +1052,7 @@ public: return; if (WebTimer <= diff) { - DoCast(me->getVictim(), SPELL_WEB); + DoCast(me->GetVictim(), SPELL_WEB); WebTimer = 20000+rand()%5000; } else WebTimer -= diff; DoMeleeAttackIfReady(); @@ -1095,13 +1095,13 @@ public: if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } else { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) + if (target && target->IsAlive()) me->AddThreat(target, 0.0f); } } @@ -1142,7 +1142,7 @@ public: return; if (ManaBurnTimer <= diff) { - DoCast(me->getVictim(), SPELL_MANA_BURN); + DoCast(me->GetVictim(), SPELL_MANA_BURN); ManaBurnTimer = 9000+rand()%5000; } else ManaBurnTimer -= diff; DoMeleeAttackIfReady(); @@ -1186,7 +1186,7 @@ public: if (waypointId == 2 && instance && !IsOverrun) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) { me->AddThreat(target, 0.0f); DoCast(target, SPELL_FROST_BREATH, true); @@ -1240,19 +1240,19 @@ public: } if (!UpdateVictim()) return; - if (!me->IsWithinDist(me->getVictim(), 25)){ + if (!me->IsWithinDist(me->GetVictim(), 25)){ if (MoveTimer <= diff) { - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); MoveTimer = 2000; } else MoveTimer-=diff; } if (FrostBreathTimer <= diff) { - if (!me->IsWithinDist(me->getVictim(), 25)) + if (!me->IsWithinDist(me->GetVictim(), 25)) { - DoCast(me->getVictim(), SPELL_FROST_BREATH); + DoCast(me->GetVictim(), SPELL_FROST_BREATH); me->StopMoving(); me->GetMotionMaster()->Clear(); FrostBreathTimer = 4000; @@ -1303,7 +1303,7 @@ public: if (waypointId == 2 && instance && !IsOverrun) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + if (target && target->IsAlive()) { me->AddThreat(target, 0.0f); DoCast(target, SPELL_GARGOYLE_STRIKE, true); @@ -1364,7 +1364,7 @@ public: } if (!UpdateVictim()) return; - if (!me->IsWithinDist(me->getVictim(), 20) || forcemove) + if (!me->IsWithinDist(me->GetVictim(), 20) || forcemove) { forcemove = false; if (forcemove) @@ -1375,7 +1375,7 @@ public: if (MoveTimer <= diff) { float x, y, z; - me->getVictim()->GetPosition(x, y, z); + me->GetVictim()->GetPosition(x, y, z); me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos); Zpos -= 1.0f; if (Zpos <= 0) @@ -1385,9 +1385,9 @@ public: } if (StrikeTimer <= diff) { - if (me->IsWithinDist(me->getVictim(), 20)) + if (me->IsWithinDist(me->GetVictim(), 20)) { - DoCast(me->getVictim(), SPELL_GARGOYLE_STRIKE); + DoCast(me->GetVictim(), SPELL_GARGOYLE_STRIKE); me->StopMoving(); me->GetMotionMaster()->Clear(); StrikeTimer = 2000+rand()%1000; @@ -1428,7 +1428,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || me->getVictim()) + if (!who || me->GetVictim()) return; if (me->IsValidAttackTarget(who)) @@ -1450,13 +1450,13 @@ public: return; if (ExplodeTimer <= diff) { - if (!me->IsWithinDistInMap(me->getVictim(), 30)) + if (!me->IsWithinDistInMap(me->GetVictim(), 30)) { EnterEvadeMode(); return; } int dmg = 500+rand()%700; - me->CastCustomSpell(me->getVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false); + me->CastCustomSpell(me->GetVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false); ExplodeTimer = 5000+rand()%5000; } else ExplodeTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 002ddda549d..4ca583e7831 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -215,16 +215,16 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()) + if (i->GetSource()) { WorldPacket packet(SMSG_MESSAGECHAT, 200); - unit->BuildMonsterChat(&packet, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); - i->getSource()->GetSession()->SendPacket(&packet); + unit->BuildMonsterChat(&packet, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->GetSource()->GetGUID()); + i->GetSource()->GetSession()->SendPacket(&packet); WorldPacket data2(SMSG_PLAY_SOUND, 4); data2 << uint32(10986); data2 << uint64(unit->GetGUID()); - i->getSource()->GetSession()->SendPacket(&data2); + i->GetSource()->GetSession()->SendPacket(&data2); } } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index cda2175a22d..f404e1b242d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -105,7 +105,7 @@ public: //Curse of twisted flesh timer if (uiCurseFleshTimer <= diff) { - DoCast(me->getVictim(), SPELL_CURSE_OF_TWISTED_FLESH); + DoCast(me->GetVictim(), SPELL_CURSE_OF_TWISTED_FLESH); uiCurseFleshTimer = 37000; } else uiCurseFleshTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index d8df5d56888..dfaec601b58 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1069,7 +1069,7 @@ public: case 72: case 74: case 76: - if (me->isInCombat()) + if (me->IsInCombat()) phaseTimer = 1000; else { @@ -1083,7 +1083,7 @@ public: } break; case 78: - if (me->isInCombat()) + if (me->IsInCombat()) phaseTimer = 1000; else { @@ -1214,7 +1214,7 @@ public: } //Battling skills - if (!me->getVictim()) + if (!me->GetVictim()) return; if (exorcismTimer < diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 109ff0f122b..30ef1427d63 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -187,7 +187,7 @@ class instance_culling_of_stratholme : public InstanceMapScript // Summon Chromie and global whisper if (Creature* chromie = instance->SummonCreature(NPC_CHROMIE_2, ChromieSummonPos)) if (!instance->GetPlayers().isEmpty()) - if (Player* player = instance->GetPlayers().getFirst()->getSource()) + if (Player* player = instance->GetPlayers().getFirst()->GetSource()) sCreatureTextMgr->SendChat(chromie, SAY_CRATES_COMPLETED, player->GetGUID(), CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_MAP); } DoUpdateWorldState(WORLDSTATE_CRATES_REVEALED, _crateCount); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 7a18210791c..72e1cacbb48 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -118,14 +118,14 @@ public: //Sand Breath if (SandBreath_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SAND_BREATH); + DoCast(me->GetVictim(), SPELL_SAND_BREATH); SandBreath_Timer = 15000+rand()%10000; } else SandBreath_Timer -= diff; //Time Stop if (TimeStop_Timer <= diff) { - DoCast(me->getVictim(), SPELL_TIME_STOP); + DoCast(me->GetVictim(), SPELL_TIME_STOP); TimeStop_Timer = 20000+rand()%15000; } else TimeStop_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index ef0d7b1f418..03ab0f193f4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -117,7 +117,7 @@ public: //Arcane Blast if (ArcaneBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_BLAST); + DoCast(me->GetVictim(), SPELL_ARCANE_BLAST); ArcaneBlast_Timer = 15000+rand()%10000; } else ArcaneBlast_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index 8159b53741e..ca60a0ca0ef 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -392,7 +392,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(ITEM_CHRONO_BEACON)) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 37b39b3a938..1278688d7ad 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -183,7 +183,7 @@ public: { if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) { - if (pMedivh->isAlive()) + if (pMedivh->IsAlive()) { pMedivh->DealDamage(pMedivh, pMedivh->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); m_auiEncounter[0] = FAIL; @@ -212,7 +212,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index adbc7a14745..c5828966438 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -126,7 +126,7 @@ public: //Hammer of Justice if (HammerOfJustice_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE); + DoCast(me->GetVictim(), SPELL_HAMMER_OF_JUSTICE); HammerOfJustice_Timer = 60000; } else HammerOfJustice_Timer -= diff; @@ -147,7 +147,7 @@ public: //Consecration if (Consecration_Timer <= diff) { - //DoCast(me->getVictim(), SPELL_CONSECRATION); + //DoCast(me->GetVictim(), SPELL_CONSECRATION); Consecration_Timer = urand(5000, 10000); } else Consecration_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index b48e0b376ea..7421a116ec0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -107,7 +107,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - DoCast(me->getVictim(), SPELL_SAND_BREATH); + DoCast(me->GetVictim(), SPELL_SAND_BREATH); Talk(SAY_BREATH); @@ -116,7 +116,7 @@ public: if (ImpendingDeath_Timer <= diff) { - DoCast(me->getVictim(), SPELL_IMPENDING_DEATH); + DoCast(me->GetVictim(), SPELL_IMPENDING_DEATH); ImpendingDeath_Timer = 25000+rand()%5000; } else ImpendingDeath_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index a4de0409573..1fb704fb67e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -166,7 +166,7 @@ public: //Whirlwind if (Whirlwind_Timer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 20000+rand()%5000; } else Whirlwind_Timer -= diff; @@ -174,7 +174,7 @@ public: if (Fear_Timer <= diff) { Talk(SAY_SHOUT); - DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); + DoCast(me->GetVictim(), SPELL_FRIGHTENING_SHOUT); Fear_Timer = 25000+rand()%10000; } else Fear_Timer -= diff; @@ -182,7 +182,7 @@ public: if (MortalStrike_Timer <= diff) { Talk(SAY_MORTAL); - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); MortalStrike_Timer = 20000+rand()%10000; } else MortalStrike_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 05ce40f500b..a488d8de86f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -81,7 +81,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) return player; } } @@ -98,7 +98,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index b9820790d47..3dfb3ed2a37 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -78,7 +78,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); InstanceScript* instance = creature->GetInstanceScript(); @@ -243,7 +243,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) { player->PrepareQuestMenu(creature->GetGUID()); player->SendPreparedQuest(creature->GetGUID()); @@ -442,7 +442,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->KilledMonsterCredit(20156, 0); } } diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index f9e736afd6f..e4b947d4603 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -149,7 +149,7 @@ class TrashRespawnWorker case NPC_EGG_PILE: case NPC_HARBINGER_OF_FLAME: case NPC_MOLTEN_EGG_TRASH: - if (!creature->isAlive()) + if (!creature->IsAlive()) creature->Respawn(true); break; case NPC_SMOULDERING_HATCHLING: @@ -195,10 +195,10 @@ class npc_harbinger_of_flame : public CreatureScript void MoveInLineOfSight(Unit* unit) { - if (me->isInCombat()) + if (me->IsInCombat()) return; - if (!unit->isCharmedOwnedByPlayerOrPlayer()) + if (!unit->IsCharmedOwnedByPlayerOrPlayer()) return; ScriptedAI::MoveInLineOfSight(unit); @@ -206,7 +206,7 @@ class npc_harbinger_of_flame : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) if (Creature* fireBird = me->FindNearestCreature((me->GetHomePosition().GetPositionY() > -275.0f ? NPC_BLAZING_MONSTROSITY_LEFT : NPC_BLAZING_MONSTROSITY_RIGHT), 100.0f)) DoCast(fireBird, SPELL_FIRE_CHANNELING); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index e8c65cf14e4..530255fddcd 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -127,7 +127,7 @@ public: Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_TOMB_OF_THE_EARTHRAGER) player->GetSession()->SendPacket(data); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 96c3c4a6c45..73c3fc179d3 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -118,11 +118,11 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); // Invisible Model me->SetDisplayId(11686); - SummonAdds(me->getVictim()); - SummonAdds(me->getVictim()); - SummonAdds(me->getVictim()); - SummonAdds(me->getVictim()); - SummonAdds(me->getVictim()); + SummonAdds(me->GetVictim()); + SummonAdds(me->GetVictim()); + SummonAdds(me->GetVictim()); + SummonAdds(me->GetVictim()); + SummonAdds(me->GetVictim()); Invisible = true; InvisibleTimer = 15000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index e01f2b097b0..39df89892cf 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -265,7 +265,7 @@ public: } break; case 9: - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); BellowingRoarTimer = 1000; break; case 10: diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 374652ee91d..d2d5c45d864 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -89,14 +89,14 @@ public: //AmnenarsWrath_Timer if (AmnenarsWrath_Timer <= diff) { - DoCast(me->getVictim(), SPELL_AMNENNARSWRATH); + DoCast(me->GetVictim(), SPELL_AMNENNARSWRATH); AmnenarsWrath_Timer = 12000; } else AmnenarsWrath_Timer -= diff; //FrostBolt_Timer if (FrostBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTBOLT); + DoCast(me->GetVictim(), SPELL_FROSTBOLT); FrostBolt_Timer = 8000; } else FrostBolt_Timer -= diff; @@ -109,7 +109,7 @@ public: if (!Spectrals60 && HealthBelowPct(60)) { Talk(SAY_SUMMON60); - DoCast(me->getVictim(), SPELL_FROST_SPECTRES); + DoCast(me->GetVictim(), SPELL_FROST_SPECTRES); Spectrals60 = true; } @@ -122,7 +122,7 @@ public: if (!Spectrals30 && HealthBelowPct(30)) { Talk(SAY_SUMMON30); - DoCast(me->getVictim(), SPELL_FROST_SPECTRES); + DoCast(me->GetVictim(), SPELL_FROST_SPECTRES); Spectrals30 = true; } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 78535b7c3b0..8bea6c5d058 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -152,7 +152,7 @@ public: { if (uiWebTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_WEB); + DoCast(me->GetVictim(), SPELL_WEB); uiWebTimer = urand(7000, 16000); } else uiWebTimer -= uiDiff; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index b374ed47d55..ff775c1a031 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -61,7 +61,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) return player; } } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 397d20e92f9..be867ecc33c 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -157,7 +157,7 @@ class boss_ayamiss : public CreatureScript SetCombatMovement(true); me->SetCanFly(false); Position VictimPos; - me->getVictim()->GetPosition(&VictimPos); + me->GetVictim()->GetPosition(&VictimPos); me->GetMotionMaster()->MovePoint(POINT_GROUND, VictimPos); DoResetThreat(); events.ScheduleEvent(EVENT_LASH, urand(5000, 8000)); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 5da6606f05f..de6924680ef 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -208,7 +208,7 @@ class npc_buru_egg : public CreatureScript void EnterCombat(Unit* attacker) { if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) - if (!buru->isInCombat()) + if (!buru->IsInCombat()) buru->AI()->AttackStart(attacker); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 033980d746b..043cba277c9 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -102,7 +102,7 @@ class boss_kurinnaxx : public CreatureScript case EVENT_SANDTRAP: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) target->CastSpell(target, SPELL_SANDTRAP, true); - else if (Unit* victim = me->getVictim()) + else if (Unit* victim = me->GetVictim()) victim->CastSpell(victim, SPELL_SANDTRAP, true); events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); break; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index bd010849045..0d49302bec3 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -220,8 +220,8 @@ class boss_ossirian : public CreatureScript events.Update(diff); // No kiting! - if (me->GetDistance(me->getVictim()) > 60.00f && me->GetDistance(me->getVictim()) < 120.00f) - DoCast(me->getVictim(), SPELL_SUMMON); + if (me->GetDistance(me->GetVictim()) > 60.00f && me->GetDistance(me->GetVictim()) < 120.00f) + DoCast(me->GetVictim(), SPELL_SUMMON); bool ApplySupreme = true; @@ -254,7 +254,7 @@ class boss_ossirian : public CreatureScript events.ScheduleEvent(EVENT_SILENCE, urand(20000, 30000)); break; case EVENT_CYCLONE: - DoCast(me->getVictim(), SPELL_CYCLONE); + DoCast(me->GetVictim(), SPELL_CYCLONE); events.ScheduleEvent(EVENT_CYCLONE, 20000); break; case EVENT_STOMP: diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index becbd126d9b..908d2a7a691 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -98,20 +98,20 @@ public: //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = urand(5000, 12000); } else Cleave_Timer -= diff; //ToxicVolley_Timer if (ToxicVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_TOXIC_VOLLEY); + DoCast(me->GetVictim(), SPELL_TOXIC_VOLLEY); ToxicVolley_Timer = urand(10000, 15000); } else ToxicVolley_Timer -= diff; if (!HealthAbovePct(5) && !Death) { - DoCast(me->getVictim(), SPELL_POISON_CLOUD); + DoCast(me->GetVictim(), SPELL_POISON_CLOUD); Death = true; } @@ -209,9 +209,9 @@ public: //KnockBack_Timer if (KnockBack_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKBACK); - if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(), -80); + DoCast(me->GetVictim(), SPELL_KNOCKBACK); + if (DoGetThreat(me->GetVictim())) + DoModifyThreatPercent(me->GetVictim(), -80); KnockBack_Timer = urand(15000, 25000); } else KnockBack_Timer -= diff; @@ -295,7 +295,7 @@ public: //Fear_Timer if (Fear_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FEAR); + DoCast(me->GetVictim(), SPELL_FEAR); DoResetThreat(); Fear_Timer = 20000; } else Fear_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index cd1f5c1befa..b99b092dd7e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -601,7 +601,7 @@ public: { for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { - if (Player* pPlr = itr->getSource()) + if (Player* pPlr = itr->GetSource()) pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER, pPlr); } } @@ -1037,7 +1037,7 @@ public: return; //EvadeTimer - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) { if (EvadeTimer <= diff) { @@ -1076,14 +1076,14 @@ public: //GroundRuptureTimer if (GroundRuptureTimer <= diff) { - DoCast(me->getVictim(), SPELL_GROUND_RUPTURE); + DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE); GroundRuptureTimer = 30000; } else GroundRuptureTimer -= diff; //HamstringTimer if (HamstringTimer <= diff) { - DoCast(me->getVictim(), SPELL_HAMSTRING); + DoCast(me->GetVictim(), SPELL_HAMSTRING); HamstringTimer = 5000; } else HamstringTimer -= diff; @@ -1149,7 +1149,7 @@ public: return; //EvadeTimer - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) { if (EvadeTimer <= diff) { @@ -1188,21 +1188,21 @@ public: //GroundRuptureTimer if (GroundRuptureTimer <= diff) { - DoCast(me->getVictim(), SPELL_GROUND_RUPTURE); + DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE); GroundRuptureTimer = 30000; } else GroundRuptureTimer -= diff; //ThrashTimer if (ThrashTimer <= diff) { - DoCast(me->getVictim(), SPELL_THRASH); + DoCast(me->GetVictim(), SPELL_THRASH); ThrashTimer = 10000; } else ThrashTimer -= diff; //HamstringTimer if (HamstringTimer <= diff) { - DoCast(me->getVictim(), SPELL_HAMSTRING); + DoCast(me->GetVictim(), SPELL_HAMSTRING); HamstringTimer = 10000; } else HamstringTimer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index de941ec266f..44352c7ef35 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -106,7 +106,7 @@ public: //MortalWound_Timer if (MortalWound_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); MortalWound_Timer = urand(10000, 20000); } else MortalWound_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index f8cf0917c37..206de40320f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -107,14 +107,14 @@ public: //Spit Timer if (Spit_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ACIDSPIT); + DoCast(me->GetVictim(), SPELL_ACIDSPIT); Spit_Timer = urand(5000, 10000); } else Spit_Timer -= diff; //NoxiousPoison_Timer if (NoxiousPoison_Timer <= diff) { - DoCast(me->getVictim(), SPELL_NOXIOUSPOISON); + DoCast(me->GetVictim(), SPELL_NOXIOUSPOISON); NoxiousPoison_Timer = urand(12000, 24000); } else NoxiousPoison_Timer -= diff; @@ -123,7 +123,7 @@ public: { if (PoisonBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_POISONBOLT); + DoCast(me->GetVictim(), SPELL_POISONBOLT); PoisonBolt_Timer = 3000; } else PoisonBolt_Timer -= diff; } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 9b095b0100a..84f35fdf9c0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -75,7 +75,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoCast(me->getVictim(), SPELL_BIRTH); + DoCast(me->GetVictim(), SPELL_BIRTH); } void UpdateAI(uint32 diff) @@ -87,14 +87,14 @@ public: //Sweep_Timer if (!Submerged && Sweep_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SWEEP); + DoCast(me->GetVictim(), SPELL_SWEEP); Sweep_Timer = urand(15000, 30000); } else Sweep_Timer -= diff; //SandBlast_Timer if (!Submerged && SandBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SANDBLAST); + DoCast(me->GetVictim(), SPELL_SANDBLAST); SandBlast_Timer = urand(20000, 35000); } else SandBlast_Timer -= diff; @@ -129,7 +129,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->setFaction(14); - DoCast(me->getVictim(), SPELL_GROUND_RUPTURE); + DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE); Submerged = false; Submerge_Timer = urand(60000, 120000); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 901438409a4..9fb241b961b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -72,7 +72,7 @@ class boss_skeram : public CreatureScript void EnterEvadeMode() { ScriptedAI::EnterEvadeMode(); - if (me->isSummon()) + if (me->IsSummon()) ((TempSummon*)me)->UnSummon(); } @@ -115,7 +115,7 @@ class boss_skeram : public CreatureScript void JustDied(Unit* /*killer*/) { - if (!me->isSummon()) + if (!me->IsSummon()) Talk(SAY_DEATH); else me->RemoveCorpse(); @@ -168,7 +168,7 @@ class boss_skeram : public CreatureScript } } - if (!me->isSummon() && me->GetHealthPct() < _hpct) + if (!me->IsSummon() && me->GetHealthPct() < _hpct) { DoCast(me, SPELL_SUMMON_IMAGES); Talk(SAY_SPLIT); @@ -177,7 +177,7 @@ class boss_skeram : public CreatureScript events.RescheduleEvent(EVENT_BLINK, 2000); } - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { events.RescheduleEvent(EVENT_EARTH_SHOCK, 2000); DoMeleeAttackIfReady(); @@ -201,7 +201,7 @@ class PlayerOrPetCheck bool operator()(WorldObject* object) const { if (object->GetTypeId() != TYPEID_PLAYER) - if (!object->ToCreature()->isPet()) + if (!object->ToCreature()->IsPet()) return true; return false; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 5f677eedcf1..d4b73a2e4a6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -154,7 +154,7 @@ struct boss_twinemperorsAI : public ScriptedAI /// @todo we should activate the other boss location so he can start attackning even if nobody // is near I dont know how to do that ScriptedAI* otherAI = CAST_AI(ScriptedAI, pOtherBoss->AI()); - if (!pOtherBoss->isInCombat()) + if (!pOtherBoss->IsInCombat()) { DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_AGGRO : SOUND_VN_AGGRO); otherAI->AttackStart(who); @@ -294,10 +294,10 @@ struct boss_twinemperorsAI : public ScriptedAI void MoveInLineOfSight(Unit* who) { - if (!who || me->getVictim()) + if (!who || me->GetVictim()) return; - if (me->canCreatureAttack(who)) + if (me->CanCreatureAttack(who)) { float attackRadius = me->GetAttackDistance(who); if (attackRadius < PULL_RANGE) @@ -441,7 +441,7 @@ public: //UnbalancingStrike_Timer if (UnbalancingStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE); + DoCast(me->GetVictim(), SPELL_UNBALANCING_STRIKE); UnbalancingStrike_Timer = 8000+rand()%12000; } else UnbalancingStrike_Timer -= diff; @@ -535,10 +535,10 @@ public: //ShadowBolt_Timer if (ShadowBolt_Timer <= diff) { - if (!me->IsWithinDist(me->getVictim(), 45.0f)) - me->GetMotionMaster()->MoveChase(me->getVictim(), VEKLOR_DIST, 0); + if (!me->IsWithinDist(me->GetVictim(), 45.0f)) + me->GetMotionMaster()->MoveChase(me->GetVictim(), VEKLOR_DIST, 0); else - DoCast(me->getVictim(), SPELL_SHADOWBOLT); + DoCast(me->GetVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; } else ShadowBolt_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index ba93c3c2640..9f9f159ee9e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -271,10 +271,10 @@ class npc_glob_of_viscidus : public CreatureScript if (BossAI* ViscidusAI = dynamic_cast<BossAI*>(Viscidus->GetAI())) ViscidusAI->SummonedCreatureDespawn(me); - if (Viscidus->isAlive() && Viscidus->GetHealthPct() < 5.0f) + if (Viscidus->IsAlive() && Viscidus->GetHealthPct() < 5.0f) { Viscidus->SetVisible(true); - Viscidus->getVictim()->Kill(Viscidus); + Viscidus->GetVictim()->Kill(Viscidus); } else { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index a9419a727b3..f92adef1634 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -140,7 +140,7 @@ public: Creature* c = Unit::GetCreature(*me, NearbyGUID[i]); if (c) { - if (!c->isInCombat()) + if (!c->IsInCombat()) { c->SetNoCallAssistance(true); if (c->AI()) diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 8fd0d2e3621..7d6d6bd003a 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -314,7 +314,7 @@ public: { if (Creature* npc = instance->GetCreature(GetData64(entry))) { - if (npc->isAlive()) + if (npc->IsAlive()) { npc->SetWalk(true); npc->GetMotionMaster()->MovePoint(1, x, y, z); @@ -343,7 +343,7 @@ public: { if (Creature* add = instance->GetCreature((*itr))) { - if (add->isAlive()) + if (add->IsAlive()) return false; } } @@ -351,7 +351,7 @@ public: { if (Creature* add = instance->GetCreature(((*itr)))) { - if (add->isAlive()) + if (add->IsAlive()) return false; } } diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index f3a74c620ae..fdbc40600a3 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -113,7 +113,7 @@ public: uint32 postGossipStep; uint32 Text_Timer; uint32 ShieldBash_Timer; - uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->getVictim() dodge, parry or block attack. Trinity support required. + uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->GetVictim() dodge, parry or block attack. Trinity support required. uint64 PlayerGUID; void Reset() @@ -165,7 +165,7 @@ public: if (ShieldBash_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHIELD_BASH); + DoCast(me->GetVictim(), SPELL_SHIELD_BASH); ShieldBash_Timer = 15000; } else @@ -173,7 +173,7 @@ public: if (Revenge_Timer <= diff) { - DoCast(me->getVictim(), SPELL_REVENGE); + DoCast(me->GetVictim(), SPELL_REVENGE); Revenge_Timer = 10000; } else @@ -191,7 +191,7 @@ public: void switchFactionIfAlive(InstanceScript* instance, uint32 entry) { if (Creature* crew = instance->instance->GetCreature(instance->GetData64(entry))) - if (crew->isAlive()) + if (crew->IsAlive()) crew->setFaction(FACTION_HOSTILE); } }; @@ -338,15 +338,15 @@ public: if (Bomb_Timer < diff) { - DoCast(me->getVictim(), SPELL_BOMB); + DoCast(me->GetVictim(), SPELL_BOMB); Bomb_Timer = 10000; } else Bomb_Timer -= diff; - if (me->isAttackReady() && !me->IsWithinMeleeRange(me->getVictim())) + if (me->isAttackReady() && !me->IsWithinMeleeRange(me->GetVictim())) { - DoCast(me->getVictim(), SPELL_SHOOT); + DoCast(me->GetVictim(), SPELL_SHOOT); me->SetSheath(SHEATH_STATE_RANGED); } else @@ -383,7 +383,7 @@ public: void DestroyDoor() { - if (me->isAlive()) + if (me->IsAlive()) { me->setFaction(FACTION_FRIENDLY); me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index dd202247aaa..1cb7d5cfd37 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -108,21 +108,21 @@ public: // //MarkOfFrostTimer // if (MarkOfFrostTimer <= diff) // { - // DoCast(me->getVictim(), SPELL_MARKOFFROST); + // DoCast(me->GetVictim(), SPELL_MARKOFFROST); // MarkOfFrostTimer = 25000; // } else MarkOfFrostTimer -= diff; //ChillTimer if (ChillTimer <= diff) { - DoCast(me->getVictim(), SPELL_CHILL); + DoCast(me->GetVictim(), SPELL_CHILL); ChillTimer = urand(13000, 25000); } else ChillTimer -= diff; //BreathTimer if (BreathTimer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTBREATH); + DoCast(me->GetVictim(), SPELL_FROSTBREATH); BreathTimer = urand(10000, 15000); } else BreathTimer -= diff; @@ -144,7 +144,7 @@ public: //CleaveTimer if (CleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); CleaveTimer = 7000; } else CleaveTimer -= diff; diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 4d7ded57501..4d689d30508 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -133,7 +133,7 @@ class npc_torek : public CreatureScript if (Rend_Timer <= diff) { - DoCast(me->getVictim(), SPELL_REND); + DoCast(me->GetVictim(), SPELL_REND); Rend_Timer = 20000; } else Rend_Timer -= diff; @@ -415,7 +415,7 @@ class npc_muglash : public CreatureScript { npc_escortAI::UpdateAI(uiDiff); - if (!me->getVictim()) + if (!me->GetVictim()) { if (HasEscortState(STATE_ESCORT_PAUSED) && IsBrazierExtinguished) { diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index f34c658cb64..5fda8ee55ce 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -256,7 +256,7 @@ public: void UpdateAI(uint32 diff) { - if (!me->isInCombat() && !IsTreeEvent) + if (!me->IsInCombat() && !IsTreeEvent) { if (EmoteTimer <= diff) { @@ -273,7 +273,7 @@ public: if (DynamiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_DYNAMITE); + DoCast(me->GetVictim(), SPELL_DYNAMITE); DynamiteTimer = 8000; } else DynamiteTimer -= diff; @@ -633,14 +633,14 @@ public: if (RendTimer <= diff) { - DoCast(me->getVictim(), SPELL_REND); + DoCast(me->GetVictim(), SPELL_REND); RendTimer = 30000; } else RendTimer -= diff; if (EnragingBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_ENRAGING_BITE); + DoCast(me->GetVictim(), SPELL_ENRAGING_BITE); EnragingBiteTimer = 15000; } else EnragingBiteTimer -= diff; diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index ed50f1a79f1..ee4b4247b55 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -259,7 +259,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE) @@ -297,10 +297,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor() && player->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE)) + if (creature->IsVendor() && player->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(7640, creature->GetGUID()); @@ -363,7 +363,7 @@ public: void AttackedBy(Unit* pAttacker) { - if (me->getVictim()) + if (me->GetVictim()) return; if (me->IsFriendlyTo(pAttacker)) @@ -442,8 +442,8 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); SetCombatMovement(true); - if (me->isInCombat()) - if (Unit* unit = me->getVictim()) + if (me->IsInCombat()) + if (Unit* unit = me->GetVictim()) me->GetMotionMaster()->MoveChase(unit); } diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index e5dc84c607e..bc8f9dab4ec 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -358,7 +358,7 @@ public: void EnterEvadeMode() { Player* player = Unit::GetPlayer(*me, PlayerGUID); - if (player && player->isInCombat() && player->getAttackerForHelper()) + if (player && player->IsInCombat() && player->getAttackerForHelper()) { AttackStart(player->getAttackerForHelper()); return; @@ -390,12 +390,12 @@ public: return; } - if (!me->isInCombat() && !EventOnWait) + if (!me->IsInCombat() && !EventOnWait) { if (checkPlayerTimer <= diff) { Player* player = Unit::GetPlayer(*me, PlayerGUID); - if (player && player->isInCombat() && player->getAttackerForHelper()) + if (player && player->IsInCombat() && player->getAttackerForHelper()) AttackStart(player->getAttackerForHelper()); checkPlayerTimer = 1000; } else checkPlayerTimer -= diff; diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index 626cfa8bc19..010eaff4e22 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -56,7 +56,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (!player->GetQuestRewardStatus(770)) @@ -119,7 +119,7 @@ public: void SpellHit(Unit* Caster, SpellInfo const* Spell) { - if (!me->getVictim() && !EventActive && Spell->Id == SPELL_LUNCH) + if (!me->GetVictim() && !EventActive && Spell->Id == SPELL_LUNCH) { if (Caster->GetTypeId() == TYPEID_PLAYER) PlayerGUID = Caster->GetGUID(); diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 95c030e6dfe..c5464d9fbd8 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -95,7 +95,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(7785) == QUEST_STATUS_NONE && @@ -205,7 +205,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE && diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 7e4a1d980db..c2ee4f574d6 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -120,15 +120,15 @@ public: { if (SendItemTimer <= diff) { - if (me->getVictim()->GetTypeId() == TYPEID_PLAYER) - SendItem(me->getVictim()); + if (me->GetVictim()->GetTypeId() == TYPEID_PLAYER) + SendItem(me->GetVictim()); SendItemTimer = 5000; } else SendItemTimer -= diff; } if (FrostShockTimer <= diff) { - DoCast(me->getVictim(), SPELL_FROST_SHOCK); + DoCast(me->GetVictim(), SPELL_FROST_SHOCK); FrostShockTimer = 15000; } else FrostShockTimer -= diff; @@ -306,7 +306,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || player->GetQuestRewardStatus(10279)) @@ -479,7 +479,7 @@ public: { FollowerAI::MoveInLineOfSight(who); - if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && who->GetEntry() == NPC_TORTA) + if (!me->GetVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && who->GetEntry() == NPC_TORTA) { if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE)) { @@ -516,7 +516,7 @@ public: PostEventTimer = 5000; Creature* torta = Creature::GetCreature(*me, TortaGUID); - if (!torta || !torta->isAlive()) + if (!torta || !torta->IsAlive()) { //something happened, so just complete SetFollowComplete(); diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index d7983c2cbe6..43fb5bf1de8 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -74,7 +74,7 @@ public: { FollowerAI::MoveInLineOfSight(who); - if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_ARYNIA) + if (!me->GetVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_ARYNIA) { if (me->IsWithinDistInMap(who, 10.0f)) { diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index d21ca8c9427..4cfe76a5c5a 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -194,7 +194,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE) @@ -380,7 +380,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || !who->isAlive() || EventInProgress) + if (!who || !who->IsAlive() || EventInProgress) return; if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) @@ -405,7 +405,7 @@ public: if (!pWarrior) return; - if (!pWarrior->isAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) { + if (!pWarrior->IsAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) { Talk(SAY_TWIGGY_FLATHEAD_DOWN); pWarrior->FailQuest(1719); @@ -414,7 +414,7 @@ public: if (AffrayChallenger[i]) { Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) creature->DisappearAndDie(); } } @@ -422,7 +422,7 @@ public: if (BigWill) // unsummon bigWill { Creature* creature = Unit::GetCreature((*me), BigWill); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) creature->DisappearAndDie(); } Reset(); @@ -462,7 +462,7 @@ public: if (AffrayChallenger[i]) { Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]); - if ((!creature || (!creature->isAlive())) && !ChallengerDown[i]) + if ((!creature || (!creature->IsAlive())) && !ChallengerDown[i]) { Talk(SAY_TWIGGY_FLATHEAD_DOWN); ChallengerDown[i] = true; @@ -478,7 +478,7 @@ public: { Talk(SAY_TWIGGY_FLATHEAD_FRAY); Creature* creature = Unit::GetCreature((*me), AffrayChallenger[Wave]); - if (creature && (creature->isAlive())) + if (creature && (creature->IsAlive())) { creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -504,7 +504,7 @@ public: else if (Wave >= 6 && EventBigWill && BigWill) { Creature* creature = Unit::GetCreature((*me), BigWill); - if (!creature || !creature->isAlive()) + if (!creature || !creature->IsAlive()) { Talk(SAY_TWIGGY_FLATHEAD_OVER); Reset(); diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index e2cf1fdd855..4c7b00a03e7 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -88,25 +88,25 @@ public: if (UppercutTimer <= diff) { - DoCast(me->getVictim(), SPELL_UPPERCUT); + DoCast(me->GetVictim(), SPELL_UPPERCUT); UppercutTimer = 20000; } else UppercutTimer -= diff; if (ThunderclapTimer <= diff) { - DoCast(me->getVictim(), SPELL_THUNDERCLAP); + DoCast(me->GetVictim(), SPELL_THUNDERCLAP); ThunderclapTimer = 15000; } else ThunderclapTimer -= diff; if (MortalStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); MortalStrikeTimer = 15000; } else MortalStrikeTimer -= diff; if (CleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); CleaveTimer = 7000; } else CleaveTimer -= diff; diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 6458047bb60..fe39f1d3abc 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -56,10 +56,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor() && player->GetReputationRank(589) == REP_EXALTED) + if (creature->IsVendor() && player->GetReputationRank(589) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 82ac2e8387c..692f4c2d25c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -123,8 +123,8 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* player = i->getSource(); - if (!player || !player->isAlive()) + Player* player = i->GetSource(); + if (!player || !player->IsAlive()) continue; // Summon clone if (Unit* summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) @@ -144,7 +144,7 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* player = i->getSource(); + Player* player = i->GetSource(); player->RemoveAurasDueToSpell(GetSpellForPhaseMask(player->GetPhaseMask())); } } @@ -245,7 +245,7 @@ public: { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { if (player->HasAura(spell)) { @@ -277,13 +277,13 @@ public: if (uiMindFlayTimer <= diff) { - DoCast(me->getVictim(), SPELL_MIND_FLAY); + DoCast(me->GetVictim(), SPELL_MIND_FLAY); uiMindFlayTimer = 20*IN_MILLISECONDS; } else uiMindFlayTimer -= diff; if (uiShadowBoltVolleyTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT_VOLLEY); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT_VOLLEY); uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS; } else uiShadowBoltVolleyTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index e8b17224179..f2bdf829494 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -178,12 +178,12 @@ public: if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround) return; - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) { - if (!me->getVictim()) + if (!me->GetVictim()) { who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH); AttackStart(who); @@ -216,8 +216,8 @@ public: if (UpdateVictim()) { - AttackStart(me->getVictim()); - me->GetMotionMaster()->MoveChase(me->getVictim()); + AttackStart(me->GetVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } else { @@ -228,7 +228,7 @@ public: if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) EnterCombat(target); } - else if (!me->isInCombat()) + else if (!me->IsInCombat()) EnterEvadeMode(); } } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index a68cbcb7ee6..5b65d049dd3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -184,7 +184,7 @@ public: Talk(SAY_FEED); me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 1.0f, true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); Phase = FEEDING; uiPhaseTimer = 20*IN_MILLISECONDS; break; @@ -219,7 +219,7 @@ public: { target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); // exclude pets & totems - if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (target && target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) target_list.push_back(target); target = NULL; } @@ -247,7 +247,7 @@ public: { Unit* pEmbraceTarget = GetEmbraceTarget(); - if (Phase == FEEDING && pEmbraceTarget && pEmbraceTarget->isAlive()) + if (Phase == FEEDING && pEmbraceTarget && pEmbraceTarget->IsAlive()) { uiEmbraceTakenDamage += damage; if (uiEmbraceTakenDamage > (uint32) DUNGEON_MODE(DATA_EMBRACE_DMG, H_DATA_EMBRACE_DMG)) @@ -397,7 +397,7 @@ public: return true; Creature* pPrinceTaldaram = Unit::GetCreature(*go, instance->GetData64(DATA_PRINCE_TALDARAM)); - if (pPrinceTaldaram && pPrinceTaldaram->isAlive()) + if (pPrinceTaldaram && pPrinceTaldaram->IsAlive()) { // maybe these are hacks :( go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 26a4aeeca01..13c0a6a3b59 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -179,7 +179,7 @@ public: for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) { Creature* cr = instance->GetCreature(*itr); - if (cr && cr->isAlive()) + if (cr && cr->IsAlive()) vInitiands.push_back(*itr); } if (vInitiands.empty()) @@ -212,7 +212,7 @@ public: for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) { Creature* cr = instance->GetCreature(*itr); - if (cr && cr->isAlive()) + if (cr && cr->IsAlive()) { cr->SetVisible(false); cr->setDeathState(JUST_DIED); @@ -267,7 +267,7 @@ public: for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) { Creature* cr = instance->GetCreature(*itr); - if (!cr || (cr && cr->isAlive())) + if (!cr || (cr && cr->IsAlive())) return 0; } return 1; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 1ec61488c1b..21666f69c9e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -217,7 +217,7 @@ public: { if (Creature* Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { - Guardian->AddThreat(me->getVictim(), 0.0f); + Guardian->AddThreat(me->GetVictim(), 0.0f); DoZoneInCombat(Guardian); } } @@ -234,7 +234,7 @@ public: { if (Creature* Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { - Venomancer->AddThreat(me->getVictim(), 0.0f); + Venomancer->AddThreat(me->GetVictim(), 0.0f); DoZoneInCombat(Venomancer); } } @@ -253,7 +253,7 @@ public: { if (Creature* Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { - Datter->AddThreat(me->getVictim(), 0.0f); + Datter->AddThreat(me->GetVictim(), 0.0f); DoZoneInCombat(Datter); } } @@ -300,7 +300,7 @@ public: if (Channeling == true) { for (uint8 i = 0; i < 8; ++i) - DoCast(me->getVictim(), SPELL_SUMMON_CARRION_BEETLES, true); + DoCast(me->GetVictim(), SPELL_SUMMON_CARRION_BEETLES, true); Channeling = false; } else if (CarrionBeetlesTimer <= diff) @@ -318,7 +318,7 @@ public: if (PoundTimer <= diff) { - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (Creature* pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, SPELL_POUND, false); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index eec7959f56f..384ecb06670 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit* Victim) { // not sure if this aura check is correct, I think it is though - if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->isAlive()) + if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->IsAlive()) return; me->ModifyHealth(int32(me->CountPctFromMaxHealth(10))); @@ -115,7 +115,7 @@ public: void CheckDistance(float dist, const uint32 uiDiff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; float x=0.0f, y=0.0f, z=0.0f; @@ -128,7 +128,7 @@ public: uiCheckDistanceTimer -= uiDiff; return; } - if (me->IsInEvadeMode() || !me->getVictim()) + if (me->IsInEvadeMode() || !me->GetVictim()) return; if (me->GetDistance(x, y, z) > dist) EnterEvadeMode(); @@ -153,7 +153,7 @@ public: if (uiPierceTimer <= diff) { - DoCast(me->getVictim(), SPELL_PIERCE_ARMOR); + DoCast(me->GetVictim(), SPELL_PIERCE_ARMOR); uiPierceTimer = 8*IN_MILLISECONDS; } else uiPierceTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 295f38658e2..2177027d177 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -151,7 +151,7 @@ public: if (uiMindFlayTimer <= diff) { - DoCast(me->getVictim(), SPELL_MIND_FLAY); + DoCast(me->GetVictim(), SPELL_MIND_FLAY); uiMindFlayTimer = 15*IN_MILLISECONDS; } else uiMindFlayTimer -= diff; @@ -211,7 +211,7 @@ public: void JustDied(Unit* /*killer*/) { //The spell is not working propperly - DoCast(me->getVictim(), SPELL_ACID_SPLASH, true); + DoCast(me->GetVictim(), SPELL_ACID_SPLASH, true); } }; @@ -257,7 +257,7 @@ public: if (uiBackstabTimer <= diff) { - DoCast(me->getVictim(), SPELL_BACKSTAB); + DoCast(me->GetVictim(), SPELL_BACKSTAB); uiBackstabTimer = 12*IN_MILLISECONDS; } else uiBackstabTimer -= diff; @@ -304,7 +304,7 @@ public: if (uiShadowNovaTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_NOVA, true); + DoCast(me->GetVictim(), SPELL_SHADOW_NOVA, true); uiShadowNovaTimer = 17*IN_MILLISECONDS; } else uiShadowNovaTimer -= diff; @@ -343,13 +343,13 @@ public: if (uiStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_STRIKE, true); + DoCast(me->GetVictim(), SPELL_STRIKE, true); uiStrikeTimer = 15*IN_MILLISECONDS; } else uiStrikeTimer -= diff; if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE, true); + DoCast(me->GetVictim(), SPELL_CLEAVE, true); uiCleaveTimer = 17*IN_MILLISECONDS; } else uiCleaveTimer -= diff; @@ -400,7 +400,7 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; @@ -448,13 +448,13 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 11*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; if (uiBindingWebsTimer <= diff) { - DoCast(me->getVictim(), SPELL_BLINDING_WEBS, true); + DoCast(me->GetVictim(), SPELL_BLINDING_WEBS, true); uiBindingWebsTimer = 17*IN_MILLISECONDS; } else uiBindingWebsTimer -= diff; @@ -503,13 +503,13 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; if (uiPoisonSprayTimer <= diff) { - DoCast(me->getVictim(), SPELL_POSION_SPRAY, true); + DoCast(me->GetVictim(), SPELL_POSION_SPRAY, true); uiPoisonSprayTimer = 17*IN_MILLISECONDS; } else uiPoisonSprayTimer -= diff; @@ -544,7 +544,7 @@ class achievement_watch_him_die : public AchievementCriteriaScript for (uint8 n = 0; n < 3; ++n) { Watcher[n] = ObjectAccessor::GetCreature(*target, instance->GetData64(DATA_WATCHER_GASHRA + n)); - if (Watcher[n] && !Watcher[n]->isAlive()) + if (Watcher[n] && !Watcher[n]->IsAlive()) return false; } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index bbec79ea43d..2b1cc2590ca 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -290,7 +290,7 @@ public: if (pTenebron) { pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); - if (pTenebron->isAlive()) + if (pTenebron->IsAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pTenebron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -308,7 +308,7 @@ public: if (pShadron) { pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); - if (pShadron->isAlive()) + if (pShadron->IsAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pShadron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -326,7 +326,7 @@ public: if (pVesperon) { pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); - if (pVesperon->isAlive()) + if (pVesperon->IsAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pVesperon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -371,11 +371,11 @@ public: Creature* pTenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)); Creature* pShadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)); Creature* pVesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)); - if (pTenebron && pTenebron->isAlive()) + if (pTenebron && pTenebron->IsAlive()) pTenebron->DisappearAndDie(); - if (pShadron && pShadron->isAlive()) + if (pShadron && pShadron->IsAlive()) pShadron->DisappearAndDie(); - if (pVesperon && pVesperon->isAlive()) + if (pVesperon && pVesperon->IsAlive()) pVesperon->DisappearAndDie(); instance->SetData(TYPE_SARTHARION_EVENT, DONE); @@ -422,10 +422,10 @@ public: //if at least one of the dragons are alive and are being called bool bCanUseWill = false; - if (pFetchTene && pFetchTene->isAlive() && !pFetchTene->getVictim()) + if (pFetchTene && pFetchTene->IsAlive() && !pFetchTene->GetVictim()) { bCanUseWill = true; - if (!pFetchTene->isInCombat()) + if (!pFetchTene->IsInCombat()) { DoCast(me, SPELL_POWER_OF_TENEBRON); AddDrakeLootMode(); @@ -437,10 +437,10 @@ public: pFetchTene->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - if (pFetchShad && pFetchShad->isAlive() && !pFetchShad->getVictim()) + if (pFetchShad && pFetchShad->IsAlive() && !pFetchShad->GetVictim()) { bCanUseWill = true; - if (!pFetchShad->isInCombat()) + if (!pFetchShad->IsInCombat()) { DoCast(me, SPELL_POWER_OF_SHADRON); AddDrakeLootMode(); @@ -452,10 +452,10 @@ public: pFetchShad->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - if (pFetchVesp && pFetchVesp->isAlive() && !pFetchVesp->getVictim()) + if (pFetchVesp && pFetchVesp->IsAlive() && !pFetchVesp->GetVictim()) { bCanUseWill = true; - if (!pFetchVesp->isInCombat()) + if (!pFetchVesp->IsInCombat()) { DoCast(me, SPELL_POWER_OF_VESPERON); AddDrakeLootMode(); @@ -477,7 +477,7 @@ public: { if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(uiDataId))) { - if (temp->isAlive() && !temp->getVictim()) + if (temp->IsAlive() && !temp->GetVictim()) { if (temp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING)) temp->SetWalk(false); @@ -521,8 +521,8 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource() && i->getSource()->isAlive()) - Talk(WHISPER_LAVA_CHURN, i->getSource()->GetGUID()); + if (i->GetSource() && i->GetSource()->IsAlive()) + Talk(WHISPER_LAVA_CHURN, i->GetSource()->GetGUID()); } } @@ -559,7 +559,7 @@ public: //spell will target dragons, if they are still alive at 35% if (!m_bIsBerserk && !HealthAbovePct(35) - && ((pTene && pTene->isAlive()) || (pShad && pShad->isAlive()) || (pVesp && pVesp->isAlive()))) + && ((pTene && pTene->IsAlive()) || (pShad && pShad->IsAlive()) || (pVesp && pVesp->IsAlive()))) { Talk(SAY_SARTHARION_BERSERK); DoCast(me, SPELL_BERSERK); @@ -620,7 +620,7 @@ public: if (m_uiFlameBreathTimer <= uiDiff) { Talk(SAY_SARTHARION_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); m_uiFlameBreathTimer = urand(25000, 35000); } else @@ -629,7 +629,7 @@ public: // Tail Sweep if (m_uiTailSweepTimer <= uiDiff) { - DoCast(me->getVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); m_uiTailSweepTimer = urand(15000, 20000); } else @@ -638,7 +638,7 @@ public: // Cleave if (m_uiCleaveTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); m_uiCleaveTimer = urand(7000, 10000); } else @@ -818,7 +818,7 @@ struct dummy_dragonAI : public ScriptedAI if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - Talk(iTextId, i->getSource()->GetGUID()); + Talk(iTextId, i->GetSource()->GetGUID()); } } } @@ -946,7 +946,7 @@ struct dummy_dragonAI : public ScriptedAI // Twilight Revenge to main boss if (Unit* pSartharion = Unit::GetUnit(*me, instance->GetData64(DATA_SARTHARION))) - if (pSartharion->isAlive()) + if (pSartharion->IsAlive()) { pSartharion->RemoveAurasDueToSpell(uiSpellId); DoCast(pSartharion, SPELL_TWILIGHT_REVENGE, true); @@ -1050,7 +1050,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_TENEBRON_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1154,7 +1154,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_SHADRON_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1238,7 +1238,7 @@ public: else { OpenPortal(); - DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); + DoCast(me->GetVictim(), SPELL_TWILIGHT_TORMENT_VESP); m_uiAcolyteVesperonTimer = urand(60000, 70000); } } @@ -1249,7 +1249,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_VESPERON_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1330,24 +1330,24 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->GetSource()->GetVictim()) { - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_RESIDUE, true); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } } } //not solo fight, so main boss has deduff pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SARTHARION)); - if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR)) + if (pDebuffTarget && pDebuffTarget->IsAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR)) pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR); //event not in progress, then solo fight and must remove debuff mini-boss pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON)); - if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA)) + if (pDebuffTarget && pDebuffTarget->IsAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA)) pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA); } } @@ -1416,7 +1416,7 @@ public: if (pVesperon) (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; - if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) + if (pVesperon && pVesperon->IsAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); Map* map = me->GetMap(); @@ -1429,15 +1429,15 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->GetSource()->GetVictim()) { - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_RESIDUE, true); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->getSource()->getVictim()) - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->GetSource()->GetVictim()) + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } } @@ -1627,8 +1627,8 @@ public: { DoCastAOE(RAID_MODE(SPELL_VOID_BLAST, SPELL_VOID_BLAST_H)); ////twilight realm - //DoCast(me->getVictim(), 57620, true); - //DoCast(me->getVictim(), 57874, true); + //DoCast(me->GetVictim(), 57620, true); + //DoCast(me->GetVictim(), 57874, true); VoidBlast_Timer = 9000; me->RemoveAllAuras(); me->Kill(me); @@ -1677,7 +1677,7 @@ public: // twilight torment if (m_uiFadeArmorTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_FADE_ARMOR); + DoCast(me->GetVictim(), SPELL_FADE_ARMOR); m_uiFadeArmorTimer = urand(5000, 10000); } else diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 9a61b83dbce..0018722e01f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -351,11 +351,11 @@ class boss_halion : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TWILIGHT_HALION))) - if (twilightHalion->isAlive()) + if (twilightHalion->IsAlive()) twilightHalion->Kill(twilightHalion); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER))) - if (controller->isAlive()) + if (controller->IsAlive()) controller->Kill(controller); } @@ -509,12 +509,12 @@ class boss_twilight_halion : public CreatureScript if (me->IsDamageEnoughForLootingAndReward()) halion->LowerPlayerDamageReq(halion->GetMaxHealth()); - if (halion->isAlive()) + if (halion->IsAlive()) killer->Kill(halion); } if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER))) - if (controller->isAlive()) + if (controller->IsAlive()) controller->Kill(controller); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); @@ -684,10 +684,10 @@ class npc_halion_controller : public CreatureScript void UpdateAI(uint32 diff) { - // The isInCombat() check is needed because that check should be false when Halion is + // The IsInCombat() check is needed because that check should be false when Halion is // not engaged, while it would return true without as UpdateVictim() checks for // combat state. - if (!(_events.IsInPhase(PHASE_INTRO)) && me->isInCombat() && !UpdateVictim()) + if (!(_events.IsInPhase(PHASE_INTRO)) && me->IsInCombat() && !UpdateVictim()) { EnterEvadeMode(); return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index d391abb0d4d..bdb0dc6209b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -118,7 +118,7 @@ class boss_saviana_ragefire : public CreatureScript me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_AGGRESSIVE); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); break; case POINT_TAKEOFF: events.ScheduleEvent(EVENT_AIR_MOVEMENT, 1); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index cd5efa56840..ca7e9915ec5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -192,7 +192,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) { DoCast(target, SPELL_HAMMER_JUSTICE); DoCast(target, SPELL_HAMMER_RIGHTEOUS); @@ -267,7 +267,7 @@ public: bDone = false; if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) - if (pMemory->isAlive()) + if (pMemory->IsAlive()) pMemory->RemoveFromWorld(); } @@ -314,7 +314,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) @@ -327,7 +327,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) @@ -349,7 +349,7 @@ public: break; case 1: if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) - if (pMemory->isAlive()) + if (pMemory->IsAlive()) DoCast(pMemory, SPELL_RENEW); break; } @@ -412,7 +412,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_OLD_WOUNDS); } uiOldWoundsTimer = 12000; @@ -428,7 +428,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; @@ -441,7 +441,7 @@ public: { if (TempSummon* summ = me->ToTempSummon()) if (Unit* summoner = summ->GetSummoner()) - if (summoner->isAlive()) + if (summoner->IsAlive()) summoner->GetAI()->SetData(1, 0); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index b253d15773d..c47e7ad1fa4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -150,7 +150,7 @@ public: void JustSummoned(Creature* summon) { SummonList.push_back(summon->GetGUID()); - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); } void UpdateAI(uint32 uiDiff) @@ -200,7 +200,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_DEATH_RESPITE); } uiDeathRespiteTimer = urand(15000, 16000); @@ -228,7 +228,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_DESECRATION); } uiDesecration = urand(15000, 16000); @@ -255,7 +255,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand (5000, 7000); @@ -329,7 +329,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, (SPELL_LEAP)); } uiAttackTimer = 3500; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 5cc8f517533..e74d420a741 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -102,12 +102,12 @@ void AggroAllPlayers(Creature* temp) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC); temp->SetReactState(REACT_AGGRESSIVE); @@ -255,8 +255,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreat(); me->AddThreat(player, 1.0f); @@ -282,8 +282,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false)) { pPassenger->CastSpell(player, SPELL_SHIELD_BREAKER, true); break; @@ -396,8 +396,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreat(); me->AddThreat(player, 5.0f); @@ -525,7 +525,7 @@ public: if (uiFireBallTimer <= uiDiff) { - if (me->getVictim()) + if (me->GetVictim()) DoCastVictim(SPELL_FIREBALL); uiFireBallTimer = 5000; } else uiFireBallTimer -= uiDiff; @@ -851,8 +851,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) { DoCast(player, SPELL_MULTI_SHOT); break; @@ -967,7 +967,7 @@ public: if (uiEviscerateTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_EVISCERATE); + DoCast(me->GetVictim(), SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 2cd4c7a9ee4..aa9314b84ee 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -108,7 +108,7 @@ public: if (!players.isEmpty()) { - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 9d0bb450a73..1d785001f72 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -391,12 +391,12 @@ public: for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { temp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 9c6d481c207..30f02ced9a0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -446,7 +446,7 @@ class mob_swarm_scarab : public CreatureScript _determinationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); DoCast(me, SPELL_ACID_MANDIBLE); me->SetInCombatWithZone(); - if (me->isInCombat()) + if (me->IsInCombat()) if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK))) Anubarak->AI()->JustSummoned(me); } @@ -520,7 +520,7 @@ class mob_nerubian_burrower : public CreatureScript DoCast(me, SPELL_SPIDER_FRENZY); DoCast(me, SPELL_AWAKENED); me->SetInCombatWithZone(); - if (me->isInCombat()) + if (me->IsInCombat()) if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK))) Anubarak->AI()->JustSummoned(me); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index f1bf0579187..c8cab5e6c98 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -632,7 +632,7 @@ struct boss_faction_championsAI : public BossAI uint32 TeamInInstance = 0; if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); if (instance) @@ -1484,7 +1484,7 @@ class mob_toc_hunter : public CreatureScript events.ScheduleEvent(EVENT_STEADY_SHOT, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); return; case EVENT_WING_CLIP: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (me->GetDistance2d(target) < 6.0f) DoCast(target, SPELL_WING_CLIP); @@ -1673,7 +1673,7 @@ class mob_toc_warrior : public CreatureScript events.ScheduleEvent(EVENT_SUNDER_ARMOR, urand(2*IN_MILLISECONDS, 5*IN_MILLISECONDS)); return; case EVENT_SHATTERING_THROW: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (target->HasAuraWithMechanic(1 << MECHANIC_IMMUNE_SHIELD)) { @@ -1752,7 +1752,7 @@ class mob_toc_dk : public CreatureScript events.ScheduleEvent(EVENT_DEATH_COIL, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); return; case EVENT_DEATH_GRIP: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (me->IsInRange(target, 5.0f, 30.0f, false)) { @@ -1871,7 +1871,7 @@ class mob_toc_rogue : public CreatureScript events.RescheduleEvent(EVENT_BLADE_FLURRY, 5*IN_MILLISECONDS); return; case EVENT_SHADOWSTEP: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (me->IsInRange(target, 10.0f, 40.0f, false)) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index c39b8403474..21c3c983c64 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -353,7 +353,7 @@ class mob_snobold_vassal : public CreatureScript void JustDied(Unit* /*killer*/) { if (Unit* target = Unit::GetPlayer(*me, _targetGUID)) - if (target->isAlive()) + if (target->IsAlive()) target->RemoveAurasDueToSpell(SPELL_SNOBOLLED); if (_instance) _instance->SetData(DATA_SNOBOLD_COUNT, DECREASE); @@ -381,12 +381,12 @@ class mob_snobold_vassal : public CreatureScript if (Unit* target = Unit::GetPlayer(*me, _targetGUID)) { - if (!target->isAlive()) + if (!target->IsAlive()) { if (_instance) { Unit* gormok = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_GORMOK)); - if (gormok && gormok->isAlive()) + if (gormok && gormok->IsAlive()) { SetCombatMovement(false); _targetDied = true; @@ -521,7 +521,7 @@ struct boss_jormungarAI : public BossAI { if (Creature* otherWorm = Unit::GetCreature(*me, instance->GetData64(OtherWormEntry))) { - if (!otherWorm->isAlive()) + if (!otherWorm->IsAlive()) { instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_DONE); @@ -663,7 +663,7 @@ struct boss_jormungarAI : public BossAI { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); SetCombatMovement(true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); me->SetDisplayId(ModelMobile); events.SetPhase(PHASE_MOBILE); events.ScheduleEvent(EVENT_SUBMERGE, 45*IN_MILLISECONDS, 0, PHASE_MOBILE); @@ -1089,9 +1089,9 @@ class boss_icehowl : public CreatureScript Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) { - if (Unit* player = itr->getSource()) + if (Unit* player = itr->GetSource()) { - if (player->isAlive() && player->IsWithinDistInMap(me, 6.0f)) + if (player->IsAlive() && player->IsWithinDistInMap(me, 6.0f)) { DoCastAOE(SPELL_TRAMPLE); events.ScheduleEvent(EVENT_TRAMPLE, 4*IN_MILLISECONDS); @@ -1117,8 +1117,8 @@ class boss_icehowl : public CreatureScript SetCombatMovement(true); me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); - AttackStart(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); + AttackStart(me->GetVictim()); events.ScheduleEvent(EVENT_MASSIVE_CRASH, 40*IN_MILLISECONDS); events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS)); _stage = 0; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index b41e986741b..fe2897295ce 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -231,7 +231,7 @@ struct boss_twin_baseAI : public BossAI { if (Creature* pSister = GetSister()) { - if (!pSister->isAlive()) + if (!pSister->IsAlive()) { me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); pSister->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 1f461c8c285..40febbd530a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -286,7 +286,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript state = DONE; break; case DONE: - if (instance->GetPlayers().getFirst()->getSource()->GetTeam() == ALLIANCE) + if (instance->GetPlayers().getFirst()->GetSource()->GetTeam() == ALLIANCE) EventStage = 4020; else EventStage = 4030; @@ -375,7 +375,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript // decrease attempt counter at wipe Map::PlayerList const &PlayerList = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, TrialCounter); // if theres no more attemps allowed diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 090ebbca69d..179f248d316 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -135,7 +135,7 @@ class npc_announcer_toc10 : public CreatureScript char const* _message = "We are ready!"; - if (player->isInCombat() || instance->IsEncounterInProgress() || instance->GetData(TYPE_EVENT)) + if (player->IsInCombat() || instance->IsEncounterInProgress() || instance->GetData(TYPE_EVENT)) return true; uint8 i = 0; @@ -208,7 +208,7 @@ class npc_announcer_toc10 : public CreatureScript creature->CastSpell(creature, SPELL_DESTROY_FLOOR_KNOCKUP, false); Creature* anubArak = Unit::GetCreature(*creature, instance->GetData64(NPC_ANUBARAK)); - if (!anubArak || !anubArak->isAlive()) + if (!anubArak || !anubArak->IsAlive()) anubArak = creature->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); instance->SetBossState(BOSS_ANUBARAK, NOT_STARTED); @@ -332,7 +332,7 @@ class boss_lich_king_toc : public CreatureScript { _instance->SetBossState(BOSS_LICH_KING, DONE); Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK)); - if (!temp || !temp->isAlive()) + if (!temp || !temp->IsAlive()) temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); _instance->SetData(TYPE_EVENT, 0); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 0ca7ccd196a..873a359b549 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -234,7 +234,7 @@ public: Map::PlayerList const &PlayerList = instance->instance->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->DeMorph(); DoCast(me, SPELL_ACHIEVEMENT_CHECK); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 516a3e0f7c9..b6f6d7fcb23 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -155,7 +155,7 @@ class boss_bronjahm : public CreatureScript events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000, 20000)); break; case EVENT_SHADOW_BOLT: - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) DoCastVictim(SPELL_SHADOW_BOLT); events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index c3158acf67d..4c99138ed3f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -338,7 +338,7 @@ class boss_devourer_of_souls : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); me->SetDisplayId(DISPLAY_ANGER); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000)); } break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index efc687eb409..1073c29b667 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -163,7 +163,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (creature->GetEntry() == NPC_JAINA_PART1) @@ -300,7 +300,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (creature->GetEntry() == NPC_JAINA_PART1) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 5014f78c9a3..03f67765406 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -47,7 +47,7 @@ class instance_forge_of_souls : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) teamInInstance = player->GetTeam(); switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index a64f2cf5467..abdd5db9d6f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -887,7 +887,7 @@ public: events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); break; case EVENT_DEADLY_POISON: - DoCast(me->getVictim(), SPELL_DEADLY_POISON); + DoCast(me->GetVictim(), SPELL_DEADLY_POISON); events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); break; case EVENT_ENVENOMED_DAGGER_THROW: @@ -896,7 +896,7 @@ public: events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); break; case EVENT_KIDNEY_SHOT: - DoCast(me->getVictim(), SPELL_KIDNEY_SHOT); + DoCast(me->GetVictim(), SPELL_KIDNEY_SHOT); events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10000); break; } @@ -942,11 +942,11 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPECTRAL_STRIKE: - DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); + DoCast(me->GetVictim(), SPELL_SPECTRAL_STRIKE); events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); break; case EVENT_SHIELD_BASH: - DoCast(me->getVictim(), SPELL_SHIELD_BASH); + DoCast(me->GetVictim(), SPELL_SHIELD_BASH); events.ScheduleEvent(EVENT_SHIELD_BASH, 5000); break; case EVENT_TORTURED_ENRAGE: @@ -1209,7 +1209,7 @@ public: { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; if (instance->GetData(DATA_INTRO_EVENT) == NOT_STARTED) @@ -1230,7 +1230,7 @@ public: { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; if (instance->GetData(DATA_WAVE_COUNT)) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index bff18b508d5..b23eb8d6ab8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -101,7 +101,7 @@ public: { Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) _teamInInstance = player->GetTeam(); switch (creature->GetEntry()) @@ -271,11 +271,11 @@ public: for (std::set<uint64>::const_iterator itr = waveGuidList[waveId].begin(); itr != waveGuidList[waveId].end(); ++itr) { Creature* npc = instance->GetCreature(*itr); - if (!npc || !npc->isAlive()) + if (!npc || !npc->IsAlive()) ++deadNpcs; } - // because the current npc returns isAlive when OnUnitDeath happens + // because the current npc returns IsAlive when OnUnitDeath happens // we check if the number of dead npcs is equal to the list-1 if (deadNpcs == waveGuidList[waveId].size() - 1) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 822adbb9201..3a2af8a98d1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -232,7 +232,7 @@ enum Events events.ScheduleEvent(EVENT_CHILLING_WAVE, 5000, 0, PHASE_TWO); else if (events.IsInPhase(PHASE_THREE)) events.ScheduleEvent(EVENT_DEEP_FREEZE, 10000, 0, PHASE_THREE); - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); break; default: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 31a1e94357e..6df01aae7b9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -205,10 +205,10 @@ class boss_ick : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; - if (!me->getVictim() && me->getThreatManager().isThreatListEmpty()) + if (!me->GetVictim() && me->getThreatManager().isThreatListEmpty()) { EnterEvadeMode(); return; @@ -530,7 +530,7 @@ class spell_krick_explosive_barrage : public SpellScriptLoader { Map::PlayerList const &players = caster->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->IsWithinDist(caster, 60.0f)) // don't know correct range caster->CastSpell(player, SPELL_EXPLOSIVE_BARRAGE_SUMMON, true); } @@ -570,7 +570,7 @@ class spell_ick_explosive_barrage : public SpellScriptLoader if (caster->GetTypeId() == TYPEID_UNIT) { caster->GetMotionMaster()->Clear(); - caster->GetMotionMaster()->MoveChase(caster->getVictim()); + caster->GetMotionMaster()->MoveChase(caster->GetVictim()); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index c335c90cc30..195a974a8d3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -397,8 +397,8 @@ class player_overlord_brandAI : public PlayerAI void DamageDealt(Unit* /*victim*/, uint32& damage, DamageEffectType /*damageType*/) { if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannus)) - if (tyrannus->getVictim()) - me->CastCustomSpell(SPELL_OVERLORD_BRAND_DAMAGE, SPELLVALUE_BASE_POINT0, damage, tyrannus->getVictim(), true, NULL, NULL, tyrannus->GetGUID()); + if (tyrannus->GetVictim()) + me->CastCustomSpell(SPELL_OVERLORD_BRAND_DAMAGE, SPELLVALUE_BASE_POINT0, damage, tyrannus->GetVictim(), true, NULL, NULL, tyrannus->GetGUID()); } void HealDone(Unit* /*target*/, uint32& addHealth) @@ -505,7 +505,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster() || !instance) + if (player->IsGameMaster() || !instance) return false; if (instance->GetBossState(DATA_TYRANNUS) != IN_PROGRESS && instance->GetBossState(DATA_TYRANNUS) != DONE) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index fa2805bdb4c..1abdf2acd60 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -65,7 +65,7 @@ class instance_pit_of_saron : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) _teamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 1ec29224763..b0befe98404 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -166,8 +166,8 @@ class boss_drakkari_colossus : public CreatureScript me->SetInCombatWithZone(); - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim(), 0, 0); break; } @@ -223,7 +223,7 @@ class boss_drakkari_colossus : public CreatureScript switch (eventId) { case EVENT_MIGHTY_BLOW: - DoCast(me->getVictim(), SPELL_MIGHTY_BLOW); + DoCast(me->GetVictim(), SPELL_MIGHTY_BLOW); events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000)); break; } @@ -474,13 +474,13 @@ public: if (mojoWaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_MOJO_WAVE); + DoCast(me->GetVictim(), SPELL_MOJO_WAVE); mojoWaveTimer = 15*IN_MILLISECONDS; } else mojoWaveTimer -= diff; if (mojoPuddleTimer <= diff) { - DoCast(me->getVictim(), SPELL_MOJO_PUDDLE); + DoCast(me->GetVictim(), SPELL_MOJO_PUDDLE); mojoPuddleTimer = 18*IN_MILLISECONDS; } else mojoPuddleTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index df949c7a962..14dcfb9e932 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -83,13 +83,13 @@ public: if (uiBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_ECK_BITE); + DoCast(me->GetVictim(), SPELL_ECK_BITE); uiBiteTimer = urand(8*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { - DoCast(me->getVictim(), SPELL_ECK_SPIT); + DoCast(me->GetVictim(), SPELL_ECK_SPIT); uiSpitTimer = urand(6*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiSpitTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index e4cdf89c165..8318a916afe 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -171,7 +171,7 @@ public: if (uiWhirlingSlashTimer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLING_SLASH); + DoCast(me->GetVictim(), SPELL_WHIRLING_SLASH); uiWhirlingSlashTimer = 21*IN_MILLISECONDS; ++uiPhaseCounter; } else uiWhirlingSlashTimer -= diff; @@ -207,19 +207,19 @@ public: { if (uiPunctureTimer <= diff) { - DoCast(me->getVictim(), SPELL_PUNCTURE); + DoCast(me->GetVictim(), SPELL_PUNCTURE); uiPunctureTimer = 8*IN_MILLISECONDS; } else uiPunctureTimer -= diff; if (uiEnrageTimer <= diff) { - DoCast(me->getVictim(), SPELL_ENRAGE); + DoCast(me->GetVictim(), SPELL_ENRAGE); uiEnrageTimer = 20*IN_MILLISECONDS; } else uiEnrageTimer -= diff; if (uiStompTimer <= diff) { - DoCast(me->getVictim(), SPELL_STOMP); + DoCast(me->GetVictim(), SPELL_STOMP); uiStompTimer = 20*IN_MILLISECONDS; } else uiStompTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 97c75b5f391..e1743bd0ade 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -107,27 +107,27 @@ public: { Talk(SAY_QUAKE); if (bPhase) - DoCast(me->getVictim(), SPELL_QUAKE, true); + DoCast(me->GetVictim(), SPELL_QUAKE, true); else - DoCast(me->getVictim(), SPELL_GROUND_TREMOR, true); + DoCast(me->GetVictim(), SPELL_GROUND_TREMOR, true); uiGroundTremorTimer = 10*IN_MILLISECONDS; } else uiGroundTremorTimer -= uiDiff; if (uiNumblingShoutTimer <= uiDiff) { if (bPhase) - DoCast(me->getVictim(), SPELL_NUMBING_ROAR, true); + DoCast(me->GetVictim(), SPELL_NUMBING_ROAR, true); else - DoCast(me->getVictim(), SPELL_NUMBING_SHOUT, true); + DoCast(me->GetVictim(), SPELL_NUMBING_SHOUT, true); uiNumblingShoutTimer = 10*IN_MILLISECONDS; } else uiNumblingShoutTimer -=uiDiff; if (uiDeterminedStabTimer <= uiDiff) { if (bPhase) - DoCast(me->getVictim(), SPELL_DETERMINED_GORE); + DoCast(me->GetVictim(), SPELL_DETERMINED_GORE); else - DoCast(me->getVictim(), SPELL_DETERMINED_STAB, true); + DoCast(me->GetVictim(), SPELL_DETERMINED_STAB, true); uiDeterminedStabTimer = 8*IN_MILLISECONDS; } else uiDeterminedStabTimer -=uiDiff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 6deb0c20676..38e3a9621f6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -130,20 +130,20 @@ public: if (uiPoisonNovaTimer <= diff) { - DoCast(me->getVictim(), SPELL_POISON_NOVA); + DoCast(me->GetVictim(), SPELL_POISON_NOVA); Talk(EMOTE_NOVA); uiPoisonNovaTimer = 15*IN_MILLISECONDS; } else uiPoisonNovaTimer -= diff; if (uiPowerfullBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_POWERFULL_BITE); + DoCast(me->GetVictim(), SPELL_POWERFULL_BITE); uiPowerfullBiteTimer = 10*IN_MILLISECONDS; } else uiPowerfullBiteTimer -= diff; if (uiVenomBoltTimer <= diff) { - DoCast(me->getVictim(), SPELL_VENOM_BOLT); + DoCast(me->GetVictim(), SPELL_VENOM_BOLT); uiVenomBoltTimer = 10*IN_MILLISECONDS; } else uiVenomBoltTimer -= diff; @@ -238,7 +238,7 @@ public: if (uiGripOfSladRanTimer <= diff) { - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); DoCast(target, SPELL_GRIP_OF_SLAD_RAN); uiGripOfSladRanTimer = urand(3, 6)*IN_MILLISECONDS; @@ -293,7 +293,7 @@ public: if (uiVenomousBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_VENOMOUS_BITE); + DoCast(me->GetVictim(), SPELL_VENOMOUS_BITE); uiVenomousBiteTimer = 10*IN_MILLISECONDS; } else uiVenomousBiteTimer -= diff; } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index d17198b0c92..ddd26fe6bc2 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -162,7 +162,7 @@ public: eckTheFerociousGUID = creature->GetGUID(); break; case CREATURE_RUIN_DWELLER: - if (creature->isAlive()) + if (creature->IsAlive()) DwellerGUIDs.insert(creature->GetGUID()); break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 833649b576d..86e455fedc8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -899,7 +899,7 @@ class boss_prince_valanar_icc : public CreatureScript break; } summons.Summon(summon); - if (me->isInCombat()) + if (me->IsInCombat()) DoZoneInCombat(summon); } @@ -1336,7 +1336,7 @@ class npc_dark_nucleus : public CreatureScript if (_targetAuraCheck <= diff) { _targetAuraCheck = 1000; - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { if (me->GetDistance(victim) < 15.0f && !victim->HasAura(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID())) @@ -1345,7 +1345,7 @@ class npc_dark_nucleus : public CreatureScript me->ClearUnitState(UNIT_STATE_CASTING); } else - MoveInLineOfSight(me->getVictim()); + MoveInLineOfSight(me->GetVictim()); } } else diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 4fbfe4219d4..40c164533ee 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -368,7 +368,7 @@ class boss_blood_queen_lana_thel : public CreatureScript case EVENT_BLOOD_MIRROR: { // victim can be NULL when this is processed in the same update tick as EVENT_AIR_PHASE - if (me->getVictim()) + if (me->GetVictim()) { Player* newOfftank = SelectRandomTarget(true); if (_offtank != newOfftank) @@ -377,8 +377,8 @@ class boss_blood_queen_lana_thel : public CreatureScript if (_offtank) { // both spells have SPELL_ATTR5_SINGLE_TARGET_SPELL, no manual removal needed - _offtank->CastSpell(me->getVictim(), SPELL_BLOOD_MIRROR_DAMAGE, true); - me->getVictim()->CastSpell(_offtank, SPELL_BLOOD_MIRROR_DUMMY, true); + _offtank->CastSpell(me->GetVictim(), SPELL_BLOOD_MIRROR_DAMAGE, true); + me->GetVictim()->CastSpell(_offtank, SPELL_BLOOD_MIRROR_DUMMY, true); DoCastVictim(SPELL_BLOOD_MIRROR_VISUAL); if (Is25ManRaid() && _offtank->GetQuestStatus(QUEST_BLOOD_INFUSION) == QUEST_STATUS_INCOMPLETE && _offtank->HasAura(SPELL_UNSATED_CRAVING) && !_offtank->HasAura(SPELL_THIRST_QUENCHED) && @@ -476,7 +476,7 @@ class boss_blood_queen_lana_thel : public CreatureScript for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) if (Unit* refTarget = (*itr)->getTarget()) - if (refTarget != me->getVictim() && refTarget->GetTypeId() == TYPEID_PLAYER && (includeOfftank || (refTarget != _offtank))) + if (refTarget != me->GetVictim() && refTarget->GetTypeId() == TYPEID_PLAYER && (includeOfftank || (refTarget != _offtank))) tempTargets.push_back(refTarget->ToPlayer()); if (tempTargets.empty()) @@ -490,7 +490,7 @@ class boss_blood_queen_lana_thel : public CreatureScript if (includeOfftank) { - tempTargets.sort(Trinity::ObjectDistanceOrderPred(me->getVictim())); + tempTargets.sort(Trinity::ObjectDistanceOrderPred(me->GetVictim())); return tempTargets.front(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index f01c28766f9..08a14c3d700 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -1274,7 +1274,7 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove(GetCaster()->getVictim()); + targets.remove(GetCaster()->GetVictim()); if (targets.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 4ec945fcb77..998e87ce015 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -331,7 +331,7 @@ class npc_stinky_icc : public CreatureScript void JustDied(Unit* /*killer*/) { if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT))) - if (festergut->isAlive()) + if (festergut->IsAlive()) festergut->AI()->Talk(SAY_STINKY_DEAD); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index a78f25bd394..f0586c74444 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -300,7 +300,7 @@ class boss_lady_deathwhisper : public CreatureScript // Full House achievement for (SummonList::iterator itr = summons.begin(); itr != summons.end(); ++itr) if (Unit* unit = ObjectAccessor::GetUnit(*me, *itr)) - if (unit->isAlive() && unit->GetEntry() != NPC_VENGEFUL_SHADE) + if (unit->IsAlive() && unit->GetEntry() != NPC_VENGEFUL_SHADE) livingAddEntries.insert(unit->GetEntry()); if (livingAddEntries.size() >= 5) @@ -308,7 +308,7 @@ class boss_lady_deathwhisper : public CreatureScript if (Creature* darnavan = ObjectAccessor::GetCreature(*me, _darnavanGUID)) { - if (darnavan->isAlive()) + if (darnavan->IsAlive()) { darnavan->setFaction(35); darnavan->CombatStop(true); @@ -321,7 +321,7 @@ class boss_lady_deathwhisper : public CreatureScript if (Group* group = owner->GetGroup()) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) member->KilledMonsterCredit(NPC_DARNAVAN_CREDIT, 0); } else @@ -359,7 +359,7 @@ class boss_lady_deathwhisper : public CreatureScript { Talk(SAY_PHASE_2); Talk(EMOTE_PHASE_2); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); damage -= me->GetPower(POWER_MANA); me->SetPower(POWER_MANA, 0); me->RemoveAurasDueToSpell(SPELL_MANA_BARRIER); @@ -595,7 +595,7 @@ class boss_lady_deathwhisper : public CreatureScript std::list<Creature*> temp; for (SummonList::iterator itr = summons.begin(); itr != summons.end(); ++itr) if (Creature* cre = ObjectAccessor::GetCreature(*me, *itr)) - if (cre->isAlive() && (cre->GetEntry() == NPC_CULT_FANATIC || cre->GetEntry() == NPC_CULT_ADHERENT)) + if (cre->IsAlive() && (cre->GetEntry() == NPC_CULT_FANATIC || cre->GetEntry() == NPC_CULT_ADHERENT)) temp.push_back(cre); // noone to empower @@ -858,7 +858,7 @@ class npc_darnavan : public CreatureScript if (Group* group = owner->GetGroup()) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) member->FailQuest(QUEST_DEPROGRAMMING); } else @@ -889,7 +889,7 @@ class npc_darnavan : public CreatureScript if (me->HasUnitState(UNIT_STATE_CASTING)) return; - if (_canShatter && me->getVictim() && me->getVictim()->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL)) + if (_canShatter && me->GetVictim() && me->GetVictim()->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL)) { DoCastVictim(SPELL_SHATTERING_THROW); _canShatter = false; @@ -897,7 +897,7 @@ class npc_darnavan : public CreatureScript return; } - if (_canCharge && !me->IsWithinMeleeRange(me->getVictim())) + if (_canCharge && !me->IsWithinMeleeRange(me->GetVictim())) { DoCastVictim(SPELL_CHARGE); _canCharge = false; @@ -992,7 +992,7 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader void HandleEffect(SpellEffIndex /*effIndex*/) { - if (GetCaster()->isSummon()) + if (GetCaster()->IsSummon()) if (Unit* owner = GetCaster()->ToTempSummon()->GetSummoner()) owner->GetAI()->SetGUID(GetCaster()->GetGUID(), GUID_CULTIST); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 7d508b154eb..8fa4e030243 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -245,7 +245,7 @@ class boss_lord_marrowgar : public CreatureScript case EVENT_BONE_STORM_END: if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); me->SetSpeed(MOVE_RUN, _baseSpeed, true); events.CancelEvent(EVENT_BONE_STORM_MOVE); events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10000); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index cab02c9ca75..6441497a4f6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -337,7 +337,7 @@ class boss_professor_putricide : public CreatureScript break; } - if (me->isInCombat()) + if (me->IsInCombat()) DoZoneInCombat(summon); } @@ -624,7 +624,7 @@ class boss_professor_putricide : public CreatureScript break; case EVENT_RESUME_ATTACK: me->SetReactState(REACT_DEFENSIVE); - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); // remove Tear Gas me->RemoveAurasDueToSpell(SPELL_TEAR_GAS_PERIODIC_TRIGGER); instance->DoRemoveAurasDueToSpellOnPlayers(71615); @@ -1312,7 +1312,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader if (!professor) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; - if (professor->AI()->GetData(DATA_PHASE) == PHASE_COMBAT_3 || !professor->isAlive()) + if (professor->AI()->GetData(DATA_PHASE) == PHASE_COMBAT_3 || !professor->IsAlive()) { extendedError = SPELL_CUSTOM_ERROR_ALL_POTIONS_USED; return SPELL_FAILED_CUSTOM_ERROR; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index f398ad55603..688febe41dd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -373,7 +373,7 @@ class npc_precious_icc : public CreatureScript { _summons.DespawnAll(); if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE))) - if (rotface->isAlive()) + if (rotface->IsAlive()) rotface->AI()->Talk(SAY_PRECIOUS_DIES); } @@ -546,7 +546,7 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (!(GetHitCreature() && GetHitUnit()->isAlive())) + if (!(GetHitCreature() && GetHitUnit()->IsAlive())) return; GetCaster()->RemoveAurasDueToSpell(SPELL_LITTLE_OOZE_COMBINE); @@ -578,7 +578,7 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (!(GetHitCreature() && GetHitCreature()->isAlive())) + if (!(GetHitCreature() && GetHitCreature()->IsAlive())) return; if (Aura* unstable = GetCaster()->GetAura(SPELL_UNSTABLE_OOZE)) @@ -620,7 +620,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (!(GetHitCreature() && GetHitCreature()->isAlive())) + if (!(GetHitCreature() && GetHitCreature()->IsAlive())) return; if (Aura* unstable = GetCaster()->GetAura(SPELL_UNSTABLE_OOZE)) @@ -635,7 +635,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader GetCaster()->RemoveAurasDueToSpell(SPELL_LARGE_OOZE_COMBINE); if (InstanceScript* instance = GetCaster()->GetInstanceScript()) if (Creature* rotface = Unit::GetCreature(*GetCaster(), instance->GetData64(DATA_ROTFACE))) - if (rotface->isAlive()) + if (rotface->IsAlive()) { rotface->AI()->Talk(EMOTE_UNSTABLE_EXPLOSION); rotface->AI()->Talk(SAY_UNSTABLE_EXPLOSION); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 7294e4a5571..53e8b6d8110 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1043,7 +1043,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader { PreventHitDefaultEffect(effIndex); - if (!GetHitUnit()->isAlive() || !_targetCount) + if (!GetHitUnit()->IsAlive() || !_targetCount) return; float resistance = float(GetHitUnit()->GetResistance(SpellSchoolMask(GetSpellInfo()->SchoolMask))); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 65da2226a74..42fe279ce87 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -361,7 +361,7 @@ class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> bool operator()(Unit* unit) const { - if (!unit || unit == _sourceObj || !unit->isTargetableForAttack() || unit->isTotem() || unit->HasAura(SPELL_PLAGUE_AVOIDANCE)) + if (!unit || unit == _sourceObj || !unit->isTargetableForAttack() || unit->IsTotem() || unit->HasAura(SPELL_PLAGUE_AVOIDANCE)) return false; if ((_notAura1 && unit->HasAura(_notAura1)) || (_notAura2 && unit->HasAura(_notAura2))) return false; @@ -762,7 +762,7 @@ class boss_the_lich_king : public CreatureScript void SpellHit(Unit* /*caster*/, SpellInfo const* spell) { - if (spell->Id == SPELL_HARVESTED_SOUL && me->isInCombat() && !IsHeroic()) + if (spell->Id == SPELL_HARVESTED_SOUL && me->IsInCombat() && !IsHeroic()) Talk(SAY_LK_FROSTMOURNE_KILL); } @@ -1124,7 +1124,7 @@ class boss_the_lich_king : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_THE_FROZEN_THRONE) player->GetSession()->SendPacket(data); } @@ -1736,7 +1736,7 @@ class npc_terenas_menethil : public CreatureScript void EnterEvadeMode() { // no running back home - if (!me->isAlive()) + if (!me->IsAlive()) return; me->DeleteThreatList(); @@ -1827,7 +1827,7 @@ class npc_terenas_menethil : public CreatureScript } // fighting Spirit Warden - if (me->isInCombat()) + if (me->IsInCombat()) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 259f2c28300..cf200530726 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -155,8 +155,8 @@ class RisenArchmageCheck // look for all permanently spawned Risen Archmages that are not yet in combat bool operator()(Creature* creature) { - return creature->isAlive() && creature->GetEntry() == NPC_RISEN_ARCHMAGE && - creature->GetDBTableGUIDLow() && !creature->isInCombat(); + return creature->IsAlive() && creature->GetEntry() == NPC_RISEN_ARCHMAGE && + creature->GetDBTableGUIDLow() && !creature->IsInCombat(); } }; @@ -547,7 +547,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript void UpdateAI(uint32 /*diff*/) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; std::list<HostileReference*> const& threatList = me->getThreatManager().getThreatList(); @@ -736,7 +736,7 @@ class npc_risen_archmage : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) if (me->GetDBTableGUIDLow()) if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) DoCast(me, SPELL_CORRUPTION); @@ -820,7 +820,7 @@ class npc_blazing_skeleton : public CreatureScript switch (eventId) { case EVENT_FIREBALL: - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) DoCastVictim(SPELL_FIREBALL); _events.ScheduleEvent(EVENT_FIREBALL, urand(2000, 4000)); break; @@ -896,7 +896,7 @@ class npc_suppresser : public CreatureScript } // this creature has REACT_PASSIVE so it does not always have victim here - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) if (victim->GetEntry() != NPC_VALITHRIA_DREAMWALKER) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 3ffa6a0c4be..aab1e5354d1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -292,7 +292,7 @@ class FrostwingVrykulSearcher bool operator()(Unit* unit) { - if (!unit->isAlive()) + if (!unit->IsAlive()) return false; switch (unit->GetEntry()) @@ -756,7 +756,7 @@ class boss_sister_svalna : public CreatureScript { if (Creature* crusader = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_CAPTAIN_ARNATH + i))) { - if (crusader->isAlive() && crusader->GetEntry() == crusader->GetCreatureData()->id) + if (crusader->IsAlive() && crusader->GetEntry() == crusader->GetCreatureData()->id) { crusader->m_Events.AddEvent(new CaptainSurviveTalk(*crusader), crusader->m_Events.CalculateTime(delay)); delay += 6000; @@ -960,7 +960,7 @@ class npc_crok_scourgebane : public CreatureScript { if (action == ACTION_START_GAUNTLET) { - if (_isEventDone || !me->isAlive()) + if (_isEventDone || !me->IsAlive()) return; _isEventActive = true; @@ -1807,7 +1807,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader wards.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); for (std::list<Creature*>::iterator itr = wards.begin(); itr != wards.end(); ++itr) { - if ((*itr)->isAlive() && (*itr)->HasAura(SPELL_STONEFORM)) + if ((*itr)->IsAlive() && (*itr)->HasAura(SPELL_STONEFORM)) { (*itr)->AI()->Talk(SAY_TRAP_ACTIVATE); (*itr)->RemoveAurasDueToSpell(SPELL_STONEFORM); @@ -1954,7 +1954,7 @@ class AliveCheck bool operator()(WorldObject* object) const { if (Unit* unit = object->ToUnit()) - return unit->isAlive(); + return unit->IsAlive(); return true; } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index c528b8413af..c7996c830a3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -59,7 +59,7 @@ class icecrown_citadel_teleport : public GameObjectScript if (!spell) return false; - if (player->isInCombat()) + if (player->IsInCombat()) { Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT); return true; @@ -79,7 +79,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) { - if (player->isInCombat()) + if (player->IsInCombat()) { if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(FROZEN_THRONE_TELEPORT)) Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index db4ab2f32d2..99af60d7bea 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -172,7 +172,7 @@ class instance_icecrown_citadel : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 421dabf48ac..a1695ee245d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -138,7 +138,7 @@ public: BossAI::SummonedCreatureDespawn(summon); // check if it is an actual killed guard - if (!me->isAlive() || summon->isAlive() || summon->GetEntry() != MOB_CRYPT_GUARD) + if (!me->IsAlive() || summon->IsAlive() || summon->GetEntry() != MOB_CRYPT_GUARD) return; summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 9013b051b9a..c34843494ba 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -166,16 +166,16 @@ public: { if (instance->GetBossState(BOSS_HORSEMEN) != NOT_STARTED) { - if (!Thane->isAlive()) + if (!Thane->IsAlive()) Thane->Respawn(); - if (!Lady->isAlive()) + if (!Lady->IsAlive()) Lady->Respawn(); - if (!Baron->isAlive()) + if (!Baron->IsAlive()) Baron->Respawn(); - if (!Sir->isAlive()) + if (!Sir->IsAlive()) Sir->Respawn(); CAST_AI(boss_four_horsemen::boss_four_horsemenAI, Thane->AI())->encounterActionReset = true; @@ -191,7 +191,7 @@ public: } if (checkAllDead) - return !Thane->isAlive() && !Lady->isAlive() && !Baron->isAlive() && !Sir->isAlive(); + return !Thane->IsAlive() && !Lady->IsAlive() && !Baron->IsAlive() && !Sir->IsAlive(); } return false; } @@ -256,9 +256,9 @@ public: // switch to "who" if nearer than current target. void SelectNearestTarget(Unit* who) { - if (me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->IsValidAttackTarget(who)) + if (me->GetVictim() && me->GetDistanceOrder(who, me->GetVictim()) && me->IsValidAttackTarget(who)) { - me->getThreatManager().modifyThreatPercent(me->getVictim(), -100); + me->getThreatManager().modifyThreatPercent(me->GetVictim(), -100); me->AddThreat(who, 1000000.0f); } } @@ -362,7 +362,7 @@ public: DoCast(target, SPELL_PRIMARY(id)); } else - DoCast(me->getVictim(), SPELL_PRIMARY(id)); + DoCast(me->GetVictim(), SPELL_PRIMARY(id)); events.ScheduleEvent(EVENT_CAST, 15000); break; @@ -385,7 +385,7 @@ public: if (!caster) DoMeleeAttackIfReady(); - else if ((!DoSpellAttackIfReady(SPELL_SECONDARY(id)) || !me->IsWithinLOSInMap(me->getVictim())) && movementCompleted && !doDelayPunish) + else if ((!DoSpellAttackIfReady(SPELL_SECONDARY(id)) || !me->IsWithinLOSInMap(me->GetVictim())) && movementCompleted && !doDelayPunish) doDelayPunish = true; } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 86ea9ce929a..53e02f639ad 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -105,7 +105,7 @@ public: switch (eventId) { case EVENT_WOUND: - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); events.ScheduleEvent(EVENT_WOUND, 10000); break; case EVENT_ENRAGE: @@ -130,11 +130,11 @@ public: } } - if (me->getVictim() && me->getVictim()->GetEntry() == MOB_ZOMBIE) + if (me->GetVictim() && me->GetVictim()->GetEntry() == MOB_ZOMBIE) { - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - me->Kill(me->getVictim()); + me->Kill(me->GetVictim()); me->ModifyHealth(int32(me->CountPctFromMaxHealth(5))); } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 2ce913e56fd..1138e3a463f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -324,19 +324,19 @@ class boss_gothik : public CreatureScript bool checkdead = false; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && - i->getSource()->GetPositionX() <= POS_X_NORTH && - i->getSource()->GetPositionX() >= POS_X_SOUTH && - i->getSource()->GetPositionY() <= POS_Y_GATE && - i->getSource()->GetPositionY() >= POS_Y_EAST) + if (i->GetSource() && i->GetSource()->IsAlive() && + i->GetSource()->GetPositionX() <= POS_X_NORTH && + i->GetSource()->GetPositionX() >= POS_X_SOUTH && + i->GetSource()->GetPositionY() <= POS_Y_GATE && + i->GetSource()->GetPositionY() >= POS_Y_EAST) { checklife = true; } - else if (i->getSource() && i->getSource()->isAlive() && - i->getSource()->GetPositionX() <= POS_X_NORTH && - i->getSource()->GetPositionX() >= POS_X_SOUTH && - i->getSource()->GetPositionY() >= POS_Y_GATE && - i->getSource()->GetPositionY() <= POS_Y_WEST) + else if (i->GetSource() && i->GetSource()->IsAlive() && + i->GetSource()->GetPositionX() <= POS_X_NORTH && + i->GetSource()->GetPositionX() >= POS_X_SOUTH && + i->GetSource()->GetPositionY() >= POS_Y_GATE && + i->GetSource()->GetPositionY() <= POS_Y_WEST) { checkdead = true; } @@ -359,7 +359,7 @@ class boss_gothik : public CreatureScript case SPELL_INFORM_LIVE_KNIGHT: spellId = SPELL_INFORM_DEAD_KNIGHT; break; case SPELL_INFORM_LIVE_RIDER: spellId = SPELL_INFORM_DEAD_RIDER; break; } - if (spellId && me->isInCombat()) + if (spellId && me->IsInCombat()) { me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST); if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) @@ -375,7 +375,7 @@ class boss_gothik : public CreatureScript void SpellHitTarget(Unit* target, SpellInfo const* spell) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; switch (spell->Id) @@ -464,11 +464,11 @@ class boss_gothik : public CreatureScript } break; case EVENT_BOLT: - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); events.ScheduleEvent(EVENT_BOLT, 1000); break; case EVENT_HARVEST: - DoCast(me->getVictim(), SPELL_HARVEST_SOUL, true); + DoCast(me->GetVictim(), SPELL_HARVEST_SOUL, true); events.ScheduleEvent(EVENT_HARVEST, urand(20000, 25000)); break; case EVENT_TELEPORT: @@ -537,7 +537,7 @@ class mob_gothik_minion : public CreatureScript void JustDied(Unit* /*killer*/) { - if (me->isSummon()) + if (me->IsSummon()) if (Unit* owner = me->ToTempSummon()->GetSummoner()) CombatAI::JustDied(owner); } @@ -561,9 +561,9 @@ class mob_gothik_minion : public CreatureScript { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && isOnSameSide(i->getSource())) + if (i->GetSource() && i->GetSource()->IsAlive() && isOnSameSide(i->GetSource())) { - AttackStart(i->getSource()); + AttackStart(i->GetSource()); return; } } @@ -576,7 +576,7 @@ class mob_gothik_minion : public CreatureScript void UpdateAI(uint32 diff) { - if (gateClose && (!isOnSameSide(me) || (me->getVictim() && !isOnSameSide(me->getVictim())))) + if (gateClose && (!isOnSameSide(me) || (me->GetVictim() && !isOnSameSide(me->GetVictim())))) { EnterEvadeMode(); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 61640f1d225..7515321a3f6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -117,7 +117,7 @@ public: events.ScheduleEvent(EVENT_FEVER, urand(15000, 20000)); events.ScheduleEvent(EVENT_PHASE, 90000); events.ScheduleEvent(EVENT_ERUPT, 15000); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } else { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9b5b26dd4f5..f7a7f233c8c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -252,7 +252,7 @@ struct NotCharmedTargetSelector : public std::unary_function<Unit*, bool> bool operator()(Unit const* target) const { - return !target->isCharmed(); + return !target->IsCharmed(); } }; @@ -431,7 +431,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); events.ScheduleEvent(EVENT_BOLT, urand(5000, 10000)); events.ScheduleEvent(EVENT_NOVA, 15000); events.ScheduleEvent(EVENT_DETONATE, urand(30000, 40000)); @@ -504,7 +504,7 @@ public: for (uint8 i = 1; i <= count; i++) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); - if (target && !target->isCharmed() && (chained.find(target->GetGUID()) == chained.end())) + if (target && !target->IsCharmed() && (chained.find(target->GetGUID()) == chained.end())) { DoCast(target, SPELL_CHAINS_OF_KELTHUZAD); float scale = target->GetFloatValue(OBJECT_FIELD_SCALE_X); @@ -525,7 +525,7 @@ public: { if (Unit* player = Unit::GetPlayer(*me, (*itr).first)) { - if (!player->isCharmed()) + if (!player->IsCharmed()) { player->SetObjectScale((*itr).second); std::map<uint64, float>::iterator next = itr; @@ -660,7 +660,7 @@ public: bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { - if (player->isGameMaster()) + if (player->IsGameMaster()) return false; InstanceScript* instance = player->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f1b2d9aeaed..c124051cc0b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -126,7 +126,7 @@ public: events.ScheduleEvent(EVENT_SHOCK, urand(10000, 20000)); break; case EVENT_POISON: - DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); events.ScheduleEvent(EVENT_POISON, urand(10000, 20000)); break; case EVENT_FRENZY: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 13a5340fa8e..cdc7de912da 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -119,7 +119,7 @@ public: for (; i != me->getThreatManager().getThreatList().end(); ++i) { Unit* target = (*i)->getTarget(); - if (target->isAlive() && target != me->getVictim() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target)) + if (target->IsAlive() && target != me->GetVictim() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target)) { MostHP = target->GetHealth(); pMostHPTarget = target; @@ -127,7 +127,7 @@ public: } if (!pMostHPTarget) - pMostHPTarget = me->getVictim(); + pMostHPTarget = me->GetVictim(); DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE, H_SPELL_HATEFUL_STRIKE), true); @@ -140,7 +140,7 @@ public: events.ScheduleEvent(EVENT_SLIME, 2000); break; case EVENT_SLIME: - DoCast(me->getVictim(), SPELL_SLIME_BOLT, true); + DoCast(me->GetVictim(), SPELL_SLIME_BOLT, true); events.ScheduleEvent(EVENT_SLIME, 2000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index c78f7d0a757..4b865046e60 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -111,7 +111,7 @@ public: switch (eventId) { case EVENT_STRIKE: - DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE); + DoCast(me->GetVictim(), SPELL_UNBALANCING_STRIKE); events.ScheduleEvent(EVENT_STRIKE, 30000); return; case EVENT_SHOUT: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index ebd1aa85078..3f5a1021729 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -174,7 +174,7 @@ class boss_sapphiron : public CreatureScript Map::PlayerList const &players = _map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) + if (itr->GetSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) { _canTheHundredClub = false; break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index ea50c67ad1c..1a2c5294f61 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -124,11 +124,11 @@ public: // and each mob will send its status at reset (meaning that it is alive) checkFeugenAlive = false; if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) - checkFeugenAlive = pFeugen->isAlive(); + checkFeugenAlive = pFeugen->IsAlive(); checkStalaggAlive = false; if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) - checkStalaggAlive = pStalagg->isAlive(); + checkStalaggAlive = pStalagg->IsAlive(); if (!checkFeugenAlive && !checkStalaggAlive) { @@ -260,7 +260,7 @@ public: events.ScheduleEvent(EVENT_SHIFT, 30000); return; case EVENT_CHAIN: - DoCast(me->getVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); return; case EVENT_BERSERK: @@ -269,8 +269,8 @@ public: } } - if (events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->getVictim())) - DoCast(me->getVictim(), SPELL_BALL_LIGHTNING); + if (events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->GetVictim())) + DoCast(me->GetVictim(), SPELL_BALL_LIGHTNING); else DoMeleeAttackIfReady(); } @@ -340,8 +340,8 @@ public: { if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) { - Unit* pStalaggVictim = me->getVictim(); - Unit* pFeugenVictim = pFeugen->getVictim(); + Unit* pStalaggVictim = me->GetVictim(); + Unit* pFeugenVictim = pFeugen->GetVictim(); if (pFeugenVictim && pStalaggVictim) { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index b85c24a22eb..9fe4c930768 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -675,7 +675,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!me->isInCombat() || _phase != PHASE_ONE) + if (!me->IsInCombat() || _phase != PHASE_ONE) return; if (who->GetEntry() == NPC_POWER_SPARK) @@ -819,7 +819,7 @@ public: break; } - me->CastSpell(me->getVictim(), SPELL_ARCANE_BREATH); + me->CastSpell(me->GetVictim(), SPELL_ARCANE_BREATH); events.ScheduleEvent(EVENT_ARCANE_BREATH, 20*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_ARCANE_STORM: @@ -1046,7 +1046,7 @@ public: Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_EYE_OF_ETERNITY) player->GetSession()->SendPacket(data); } @@ -1426,7 +1426,7 @@ class npc_nexus_lord : public CreatureScript _events.ScheduleEvent(EVENT_HASTE_BUFF, 15*IN_MILLISECONDS); break; case EVENT_NUKE_DUMMY: - DoCast(me->getVictim(), SPELL_DUMMY_NUKE, true); + DoCast(me->GetVictim(), SPELL_DUMMY_NUKE, true); DoCast(me, SPELL_ALIGN_DISK_AGGRO, true); _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1*IN_MILLISECONDS); break; @@ -1901,7 +1901,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader if (Unit* target = (*itr)->getTarget()) { Player* targetPlayer = target->ToPlayer(); - if (!targetPlayer || targetPlayer->isGameMaster()) + if (!targetPlayer || targetPlayer->IsGameMaster()) continue; if (InstanceScript* instance = caster->GetInstanceScript()) @@ -1999,7 +1999,7 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader { Creature* caster = GetCaster()->ToCreature(); if (Creature* target = GetHitCreature()) - target->GetMotionMaster()->MoveChase(caster->getVictim()); + target->GetMotionMaster()->MoveChase(caster->GetVictim()); } void Register() diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 079732b0f14..696ef48ba93 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -206,7 +206,7 @@ public: { Player* player = target->ToPlayer(); - if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4)) + if (!player || player->IsGameMaster() || player->HasAura(SPELL_VORTEX_4)) continue; player->CastSpell(trigger, SPELL_VORTEX_4, true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index e84431a0788..c20f7da5d2e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -181,7 +181,7 @@ public: if (uiCrystalfireBreathTimer <= diff) { - DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH); + DoCast(me->GetVictim(), SPELL_CRYSTALFIRE_BREATH); uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; } else uiCrystalfireBreathTimer -= diff; @@ -217,7 +217,7 @@ public: InstanceScript* instance = go->GetInstanceScript(); Creature* pKeristrasza = Unit::GetCreature(*go, instance ? instance->GetData64(DATA_KERISTRASZA) : 0); - if (pKeristrasza && pKeristrasza->isAlive()) + if (pKeristrasza && pKeristrasza->IsAlive()) { // maybe these are hacks :( go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 26bf80cb32e..7bf6bb247fa 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -193,7 +193,7 @@ public: void SummonedCreatureDespawn(Creature* summon) { - if (summon->isAlive()) + if (summon->IsAlive()) return; if (summon->GetGUID() == uiFireMagusGUID) @@ -313,7 +313,7 @@ public: if (uiGravityWellTimer <= diff) { - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { DoCast(target, SPELL_GRAVITY_WELL); uiCooldown = 6*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 81d5141a6a6..03d97ebf33d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -71,7 +71,7 @@ public: if (!players.isEmpty()) { - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index d27909328a5..bdc7096d2ad 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -210,7 +210,7 @@ public: switch (eventId) { case EVENT_ARCANE_BARRAGE: - DoCast(me->getVictim(), SPELL_ARCANE_BARRAGE); + DoCast(me->GetVictim(), SPELL_ARCANE_BARRAGE); events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ARCANE_VOLLEY: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 57a9c9958df..bf513b51855 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -273,10 +273,10 @@ public: if (arcaneExplosionTimer <= uiDiff) { Position pPos; - me->getVictim()->GetPosition(&pPos); + me->GetVictim()->GetPosition(&pPos); me->NearTeleportTo(pPos.GetPositionX(), pPos.GetPositionY(), pPos.GetPositionZ(), pPos.GetOrientation()); - me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); + me->GetMotionMaster()->MoveChase(me->GetVictim(), 0, 0); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); Talk(EMOTE_ARCANE_EXPLOSION); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 111e6b2c7aa..c7da2e695f4 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -134,7 +134,7 @@ public: events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS); break; case EVENT_AMPLIFY_MAGIC: - DoCast(me->getVictim(), SPELL_CALL_AMPLIFY_MAGIC); + DoCast(me->GetVictim(), SPELL_CALL_AMPLIFY_MAGIC); events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index fcd23b0ce6d..94f08d82f94 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -131,7 +131,7 @@ public: creature->SetPhaseMask(1, true); break; case NPC_CENTRIFUGE_CONSTRUCT: - if (creature->isAlive()) + if (creature->IsAlive()) DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, ++centrifugueConstructCounter); break; case NPC_BELGARISTRASZ: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 71ef0cbe3ce..e9e9cf65e1f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -218,7 +218,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (InstanceScript* instance = creature->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index e7c6e920970..80453d62e29 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -154,7 +154,7 @@ public: { if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*me), m_auiStormforgedLieutenantGUID[i]))) { - if (!pStormforgedLieutenant->isAlive()) + if (!pStormforgedLieutenant->IsAlive()) pStormforgedLieutenant->Respawn(); } } @@ -295,7 +295,7 @@ public: if (m_uiPummel_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_PUMMEL); + DoCast(me->GetVictim(), SPELL_PUMMEL); m_uiPummel_Timer = urand(10000, 11000); } else @@ -316,7 +316,7 @@ public: if (m_uiIntercept_Timer <= uiDiff) { //not much point is this, better random target and more often? - DoCast(me->getVictim(), SPELL_INTERCEPT); + DoCast(me->GetVictim(), SPELL_INTERCEPT); m_uiIntercept_Timer = urand(45000, 46000); } else @@ -332,7 +332,7 @@ public: if (m_uiCleave_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); m_uiCleave_Timer = urand(8000, 9000); } else @@ -344,7 +344,7 @@ public: { if (m_uiMortalStrike_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); m_uiMortalStrike_Timer = urand(20000, 21000); } else @@ -352,7 +352,7 @@ public: if (m_uiSlam_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SLAM); + DoCast(me->GetVictim(), SPELL_SLAM); m_uiSlam_Timer = urand(15000, 16000); } else @@ -406,7 +406,7 @@ public: { if (Creature* pBjarngrim = instance->instance->GetCreature(instance->GetData64(DATA_BJARNGRIM))) { - if (pBjarngrim->isAlive() && !pBjarngrim->getVictim()) + if (pBjarngrim->IsAlive() && !pBjarngrim->GetVictim()) pBjarngrim->AI()->AttackStart(who); } } @@ -420,7 +420,7 @@ public: if (m_uiArcWeld_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_ARC_WELD); + DoCast(me->GetVictim(), SPELL_ARC_WELD); m_uiArcWeld_Timer = urand(20000, 21000); } else @@ -432,7 +432,7 @@ public: { if (Creature* pBjarngrim = instance->instance->GetCreature(instance->GetData64(DATA_BJARNGRIM))) { - if (pBjarngrim->isAlive()) + if (pBjarngrim->IsAlive()) DoCast(pBjarngrim, SPELL_RENEW_STEEL_N); } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 9ce8ea3c52c..5ebe44c7b22 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -172,7 +172,7 @@ public: { if (Creature* pSpark = Unit::GetCreature(*me, *itr)) { - if (pSpark->isAlive()) + if (pSpark->IsAlive()) { pSpark->SetSpeed(MOVE_RUN, 2.0f); pSpark->GetMotionMaster()->Clear(); @@ -243,8 +243,8 @@ public: uiSplitTimer = 25*IN_MILLISECONDS; bIsSplitPhase = true; - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); } } else @@ -265,7 +265,7 @@ public: if (uiBallLightningTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_BALL_LIGHTNING); + DoCast(me->GetVictim(), SPELL_BALL_LIGHTNING); uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else @@ -350,7 +350,7 @@ public: if (instance) { Creature* pIonar = instance->instance->GetCreature(instance->GetData64(DATA_IONAR)); - if (pIonar && pIonar->isAlive()) + if (pIonar && pIonar->IsAlive()) { if (me->GetDistance(pIonar) > DATA_MAX_SPARK_DISTANCE) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1e41f346942..e76622280ac 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -168,7 +168,7 @@ public: { if (Creature* temp = Unit::GetCreature(*me, *itr)) { - if (temp->isAlive()) + if (temp->IsAlive()) temp->DespawnOrUnsummon(); } } @@ -186,7 +186,7 @@ public: if (Creature* temp = Unit::GetCreature(*me, *itr)) { // Only shatter brittle golems - if (temp->isAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM) + if (temp->IsAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM) { temp->CastSpell(temp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false); GolemsShattered += 1; @@ -236,8 +236,8 @@ public: if (m_uiPause_Timer <= uiDiff) { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE) - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); m_bHasTemper = false; m_bIsStriking = false; @@ -443,7 +443,7 @@ public: if (m_uiImmolation_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_IMMOLATION_STRIKE_N); + DoCast(me->GetVictim(), SPELL_IMMOLATION_STRIKE_N); m_uiImmolation_Timer = 5000; } else diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index adbc8827212..0603ce0f764 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -173,8 +173,8 @@ public: //and correct movement, if not already if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE) { - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); } } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 71222aba88b..464d6f13e4d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -126,7 +126,7 @@ public: if (StormOfGriefTimer <= diff) { - DoCast(me->getVictim(), SPELL_STORM_OF_GRIEF_N, true); + DoCast(me->GetVictim(), SPELL_STORM_OF_GRIEF_N, true); StormOfGriefTimer = urand(15000, 20000); } else StormOfGriefTimer -= diff; @@ -145,7 +145,7 @@ public: if (target) DoCast(target, SPELL_PILLAR_OF_WOE_N); else - DoCast(me->getVictim(), SPELL_PILLAR_OF_WOE_N); + DoCast(me->GetVictim(), SPELL_PILLAR_OF_WOE_N); PillarOfWoeTimer = urand(5000, 25000); } else PillarOfWoeTimer -= diff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 3b0faa08574..359c7e0172e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -168,7 +168,7 @@ public: if (uiStaticChargeTimer <= diff) { - DoCast(me->getVictim(), SPELL_STATIC_CHARGE); + DoCast(me->GetVictim(), SPELL_STATIC_CHARGE); uiStaticChargeTimer = urand(20000, 25000); } uiStaticChargeTimer -= diff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 0a9ae889588..3b9f3125154 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -186,7 +186,7 @@ public: uint32 uiPositionCounter = 0; for (std::list<Creature*>::const_iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr) { - if ((*itr)->isAlive()) + if ((*itr)->IsAlive()) { if (uiPositionCounter == 0) { @@ -216,7 +216,7 @@ public: { if (Creature* pKaddrak = Unit::GetCreature(*me, *itr)) { - if (pKaddrak->isAlive()) + if (pKaddrak->IsAlive()) pKaddrak->CastSpell(target, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); } } @@ -279,7 +279,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -337,7 +337,7 @@ public: for (std::list<uint64>::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) { Creature* temp = Unit::GetCreature(*me, instance ? (*itr) : 0); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DespawnOrUnsummon(); } lDwarfGUIDList.clear(); @@ -350,7 +350,7 @@ public: case 7: if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) { - if (!creature->isAlive()) + if (!creature->IsAlive()) creature->Respawn(); CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, creature->AI())->UpdateFacesList(); uiControllerGUID = creature->GetGUID(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 5a5efc36b3c..d1e13be3f60 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -360,7 +360,7 @@ class boss_algalon_the_observer : public CreatureScript case EVENT_DESPAWN_ALGALON: events.Reset(); events.SetPhase(PHASE_ROLE_PLAY); - if (me->isInCombat()) + if (me->IsInCombat()) events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 1); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_1, 5000); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_2, 17000); @@ -1074,7 +1074,7 @@ class spell_algalon_phase_punch : public SpellScriptLoader class NotVictimFilter { public: - NotVictimFilter(Unit* caster) : _victim(caster->getVictim()) + NotVictimFilter(Unit* caster) : _victim(caster->GetVictim()) { } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index b3f5cc38c9f..74308245114 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -204,11 +204,11 @@ class boss_steelbreaker : public CreatureScript //DoCastAOE(SPELL_SUPERCHARGE, true); if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRUNDIR))) - if (Brundir->isAlive()) + if (Brundir->IsAlive()) Brundir->AI()->DoAction(ACTION_SUPERCHARGE); if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOLGEIM))) - if (Molgeim->isAlive()) + if (Molgeim->IsAlive()) Molgeim->AI()->DoAction(ACTION_SUPERCHARGE); } } @@ -242,7 +242,7 @@ class boss_steelbreaker : public CreatureScript events.CancelEvent(EVENT_BERSERK); break; case EVENT_FUSION_PUNCH: - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) DoCastVictim(SPELL_FUSION_PUNCH); events.ScheduleEvent(EVENT_FUSION_PUNCH, urand(13000, 22000)); break; @@ -341,11 +341,11 @@ class boss_runemaster_molgeim : public CreatureScript //DoCastAOE(SPELL_SUPERCHARGE, true); if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRUNDIR))) - if (Brundir->isAlive()) + if (Brundir->IsAlive()) Brundir->AI()->DoAction(ACTION_SUPERCHARGE); if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Steelbreaker->isAlive()) + if (Steelbreaker->IsAlive()) Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); } } @@ -382,12 +382,12 @@ class boss_runemaster_molgeim : public CreatureScript { case 1: if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Steelbreaker->isAlive()) + if (Steelbreaker->IsAlive()) target = Steelbreaker; break; case 2: if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Brundir->isAlive()) + if (Brundir->IsAlive()) target = Brundir; break; default: @@ -506,11 +506,11 @@ class boss_stormcaller_brundir : public CreatureScript //DoCastAOE(SPELL_SUPERCHARGE, true); if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOLGEIM))) - if (Molgeim->isAlive()) + if (Molgeim->IsAlive()) Molgeim->AI()->DoAction(ACTION_SUPERCHARGE); if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Steelbreaker->isAlive()) + if (Steelbreaker->IsAlive()) Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); } @@ -594,12 +594,12 @@ class boss_stormcaller_brundir : public CreatureScript //me->SetLevitate(false); me->RemoveAurasDueToSpell(RAID_MODE(SPELL_LIGHTNING_TENDRILS_10M, SPELL_LIGHTNING_TENDRILS_25M)); me->RemoveAurasDueToSpell(SPELL_LIGHTNING_TENDRILS_VISUAL); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); events.CancelEvent(EVENT_GROUND); me->getThreatManager().resetAllAggro(); break; case EVENT_MOVE_POSITION: - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { float x = float(irand(-25, 25)); float y = float(irand(-25, 25)); @@ -701,7 +701,7 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_RUNE_OF_SUMMONING_SUMMON, true, NULL, aurEff, GetTarget()->isSummon() ? GetTarget()->ToTempSummon()->GetSummonerGUID() : 0); + GetTarget()->CastSpell(GetTarget(), SPELL_RUNE_OF_SUMMONING_SUMMON, true, NULL, aurEff, GetTarget()->IsSummon() ? GetTarget()->ToTempSummon()->GetSummonerGUID() : 0); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 5faa2cc4628..b2d6dbca7b1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -146,8 +146,8 @@ class boss_auriaya : public CreatureScript if (summoned->GetEntry() == NPC_FERAL_DEFENDER) { - if (!summoned->isInCombat() && me->getVictim()) - summoned->AI()->AttackStart(me->getVictim()); + if (!summoned->IsInCombat() && me->GetVictim()) + summoned->AI()->AttackStart(me->GetVictim()); summoned->SetAuraStack(SPELL_FERAL_ESSENCE, summoned, 9); DefenderGUID = summoned->GetGUID(); DoZoneInCombat(summoned); @@ -247,8 +247,8 @@ class boss_auriaya : public CreatureScript if (defenderLives) Defender->SetAuraStack(SPELL_FERAL_ESSENCE, Defender, defenderLives); Defender->SetInCombatWithZone(); - if (!Defender->isInCombat()) - Defender->AI()->AttackStart(me->getVictim()); + if (!Defender->IsInCombat()) + Defender->AI()->AttackStart(me->GetVictim()); events.CancelEvent(EVENT_RESPAWN_DEFENDER); } break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 37ecf7874b8..bec1a32e2e8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -531,7 +531,7 @@ class boss_flame_leviathan : public CreatureScript } private: - //! Copypasta from DoSpellAttackIfReady, only difference is the target - it cannot be selected trough getVictim this way - + //! Copypasta from DoSpellAttackIfReady, only difference is the target - it cannot be selected trough GetVictim this way - //! I also removed the spellInfo check void DoBatteringRamIfReady() { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 3299148ea43..09298de1698 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -330,7 +330,7 @@ class boss_freya : public CreatureScript for (uint8 n = 0; n < 3; ++n) { Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n)); - if (Elder[n] && Elder[n]->isAlive()) + if (Elder[n] && Elder[n]->IsAlive()) { me->AddAura(SPELL_DRAINED_OF_POWER, Elder[n]); Elder[n]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); @@ -342,19 +342,19 @@ class boss_freya : public CreatureScript } } - if (Elder[0] && Elder[0]->isAlive()) + if (Elder[0] && Elder[0]->IsAlive()) { Elder[0]->CastSpell(me, SPELL_BRIGHTLEAF_ESSENCE, true); events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, urand(10000, 20000)); } - if (Elder[1] && Elder[1]->isAlive()) + if (Elder[1] && Elder[1]->IsAlive()) { Elder[1]->CastSpell(me, SPELL_STONEBARK_ESSENCE, true); events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(10000, 20000)); } - if (Elder[2] && Elder[2]->isAlive()) + if (Elder[2] && Elder[2]->IsAlive()) { Elder[2]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(10000, 20000)); @@ -474,7 +474,7 @@ class boss_freya : public CreatureScript { for (uint8 n = 0; n < 3; ++n) { - if (Elemental[n][i]->isAlive()) + if (Elemental[n][i]->IsAlive()) Elemental[n][i]->SetHealth(Elemental[n][i]->GetMaxHealth()); else Elemental[n][i]->Respawn(); @@ -605,7 +605,7 @@ class boss_freya : public CreatureScript for (uint8 n = 0; n < 3; ++n) { Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n)); - if (Elder[n] && Elder[n]->isAlive()) + if (Elder[n] && Elder[n]->IsAlive()) { Elder[n]->RemoveAllAuras(); Elder[n]->AttackStop(); @@ -1068,7 +1068,7 @@ class npc_detonating_lasher : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) { // Switching to other target - modify aggro of new target by 20% from current target's aggro - me->AddThreat(target, me->getThreatManager().getThreat(me->getVictim(), false) * 1.2f); + me->AddThreat(target, me->getThreatManager().getThreat(me->GetVictim(), false) * 1.2f); me->AI()->AttackStart(target); } changeTargetTimer = urand(5000, 10000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 1642cc0483f..5ee55febba3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -231,7 +231,7 @@ class boss_general_vezax : public CreatureScript // If Shaman has Shamanistic Rage and use it during the fight, it will cast Corrupted Rage on him Map::PlayerList const& Players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = Players.begin(); itr != Players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->HasSpell(SPELL_SHAMANTIC_RAGE)) player->CastSpell(player, SPELL_CORRUPTED_RAGE, false); } @@ -278,7 +278,7 @@ class boss_general_vezax : public CreatureScript Map::PlayerList const& Players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = Players.begin(); itr != Players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { float distance = player->GetDistance(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); if (rangeMin > distance || distance > rangeMax) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 0f99ea9cc2d..33958f0a38a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -195,16 +195,16 @@ class npc_flash_freeze : public CreatureScript void UpdateAI(uint32 diff) { - if (!UpdateVictim() || me->getVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->getVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) + if (!UpdateVictim() || me->GetVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->GetVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; - if (me->getVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) + if (me->GetVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) me->DespawnOrUnsummon(); if (checkDespawnTimer <= diff) { if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID)) - if (!target->isAlive()) + if (!target->IsAlive()) me->DisappearAndDie(); checkDespawnTimer = 2500; } @@ -277,7 +277,7 @@ class npc_ice_block : public CreatureScript if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) { - if (!Hodir->isInCombat()) + if (!Hodir->IsInCombat()) { Hodir->SetReactState(REACT_AGGRESSIVE); Hodir->AI()->DoZoneInCombat(); @@ -484,7 +484,7 @@ class boss_hodir : public CreatureScript for (std::list<Unit*>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { Unit* target = *itr; - if (!target || !target->isAlive() || GetClosestCreatureWithEntry(target, NPC_SNOWPACKED_ICICLE, 5.0f)) + if (!target || !target->IsAlive() || GetClosestCreatureWithEntry(target, NPC_SNOWPACKED_ICICLE, 5.0f)) continue; if (target->HasAura(SPELL_FLASH_FREEZE_HELPER) || target->HasAura(SPELL_BLOCK_OF_ICE)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index b040a64c75a..2d5ddb50e5d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -175,7 +175,7 @@ class boss_ignis : public CreatureScript summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED | UNIT_FLAG_STUNNED | UNIT_FLAG_DISABLE_MOVE); } - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); summon->AI()->DoZoneInCombat(); summons.Summon(summon); } @@ -251,7 +251,7 @@ class boss_ignis : public CreatureScript break; case EVENT_SCORCH: Talk(SAY_SCORCH); - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) me->SummonCreature(NPC_GROUND_SCORCH, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 45000); DoCast(SPELL_SCORCH); events.ScheduleEvent(EVENT_SCORCH, 25000); @@ -452,7 +452,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (GetTarget()->isAlive()) + if (GetTarget()->IsAlive()) GetTarget()->CastSpell(GetTarget(), SPELL_SLAG_IMBUED, true); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index b558508f78a..7c9f534c27a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -257,7 +257,7 @@ class boss_kologarn : public CreatureScript switch (eventId) { case EVENT_MELEE_CHECK: - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) DoCast(SPELL_PETRIFY_BREATH); events.ScheduleEvent(EVENT_MELEE_CHECK, 1 * IN_MILLISECONDS); break; @@ -397,7 +397,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void FilterTargetsInitial(std::list<WorldObject*>& unitList) { // Remove "main tank" and non-player targets - unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); + unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->GetVictim())); // Maximum affected targets per difficulty mode uint32 maxTargets = 1; if (GetSpellInfo()->Id == 63981) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index ac46fbc1227..79b04d412d1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -494,7 +494,7 @@ class boss_razorscale : public CreatureScript events.CancelEvent(EVENT_BUFFET); return; case EVENT_FUSE: - DoCast(me->getVictim(), SPELL_FUSEARMOR); + DoCast(me->GetVictim(), SPELL_FUSEARMOR); events.ScheduleEvent(EVENT_FUSE, 10000, 0, PHASE_PERMAGROUND); return; } @@ -864,7 +864,7 @@ class npc_darkrune_watcher : public CreatureScript if (ChainTimer <= Diff) { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTNING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING); ChainTimer = urand(10000, 15000); } else @@ -924,7 +924,7 @@ class npc_darkrune_guardian : public CreatureScript if (StormTimer <= Diff) { - DoCast(me->getVictim(), SPELL_STORMSTRIKE); + DoCast(me->GetVictim(), SPELL_STORMSTRIKE); StormTimer = urand(4000, 8000); } else @@ -970,7 +970,7 @@ class npc_darkrune_sentinel : public CreatureScript if (HeroicTimer <= Diff) { - DoCast(me->getVictim(), SPELL_HEROIC_STRIKE); + DoCast(me->GetVictim(), SPELL_HEROIC_STRIKE); HeroicTimer = urand(4000, 6000); } else @@ -978,7 +978,7 @@ class npc_darkrune_sentinel : public CreatureScript if (WhirlTimer <= Diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); WhirlTimer = urand(20000, 25000); } else diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 76a60607f7e..39ef5284ba7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -579,11 +579,11 @@ class mob_pummeller : public CreatureScript if (!UpdateVictim()) return; - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { if (_arcingSmashTimer <= diff) { - DoCast(me->getVictim(), SPELL_ARCING_SMASH); + DoCast(me->GetVictim(), SPELL_ARCING_SMASH); _arcingSmashTimer = TIMER_ARCING_SMASH; } else @@ -591,7 +591,7 @@ class mob_pummeller : public CreatureScript if (_trampleTimer <= diff) { - DoCast(me->getVictim(), SPELL_TRAMPLE); + DoCast(me->GetVictim(), SPELL_TRAMPLE); _trampleTimer = TIMER_TRAMPLE; } else @@ -599,7 +599,7 @@ class mob_pummeller : public CreatureScript if (_uppercutTimer <= diff) { - DoCast(me->getVictim(), SPELL_UPPERCUT); + DoCast(me->GetVictim(), SPELL_UPPERCUT); _uppercutTimer = TIMER_UPPERCUT; } else @@ -753,9 +753,9 @@ class mob_life_spark : public CreatureScript if (_shockTimer <= diff) { - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - DoCast(me->getVictim(), SPELL_SHOCK); + DoCast(me->GetVictim(), SPELL_SHOCK); _shockTimer = TIMER_SHOCK; } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 97554a63217..cd3c059ad24 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -433,7 +433,7 @@ class boss_voice_of_yogg_saron : public CreatureScript void MoveInLineOfSight(Unit* who) { // TODO: MoveInLineOfSight doesn't work for such a big distance - if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->isInCombat()) + if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->IsInCombat()) me->SetInCombatWithZone(); } @@ -448,7 +448,7 @@ class boss_voice_of_yogg_saron : public CreatureScript // not sure, spoken by Sara (sound), regarding to wowwiki Voice whispers it Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { if (events.IsInPhase(PHASE_ONE)) Talk(WHISPER_VOICE_PHASE_1_WIPE, player->GetGUID()); @@ -750,7 +750,7 @@ class boss_sara : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; if (me->HasAura(SPELL_SHATTERED_ILLUSION)) @@ -932,7 +932,7 @@ class boss_yogg_saron : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { player->RemoveAurasDueToSpell(SPELL_SANITY); player->RemoveAurasDueToSpell(SPELL_INSANE); @@ -1609,7 +1609,7 @@ class npc_yogg_saron_keeper : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; _events.Update(diff); @@ -2428,7 +2428,7 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125 void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* vehicle = GetTarget()->GetVehicleBase()) - if (vehicle->isAlive()) + if (vehicle->IsAlive()) vehicle->Kill(vehicle); // should tentacle die or just release its target? } @@ -2910,7 +2910,7 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (GetTarget()->isAlive()) + if (GetTarget()->IsAlive()) GetTarget()->Kill(GetTarget()); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 421d0ecf3c9..4f7cbbff099 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -232,7 +232,7 @@ class instance_ulduar : public InstanceMapScript { Map::PlayerList const& Players = instance->GetPlayers(); if (!Players.isEmpty()) - if (Player* player = Players.begin()->getSource()) + if (Player* player = Players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } @@ -621,19 +621,19 @@ class instance_ulduar : public InstanceMapScript switch (eventId) { case EVENT_TOWER_OF_STORM_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_STORM_DESTROYED); break; case EVENT_TOWER_OF_FROST_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_FROST_DESTROYED); break; case EVENT_TOWER_OF_FLAMES_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_FLAMES_DESTROYED); break; case EVENT_TOWER_OF_LIFE_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_LIFE_DESTROYED); break; case EVENT_ACTIVATE_SANITY_WELL: @@ -724,7 +724,7 @@ class instance_ulduar : public InstanceMapScript // get item level (recheck weapons) Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) for (uint8 slot = EQUIPMENT_SLOT_MAINHAND; slot <= EQUIPMENT_SLOT_RANGED; ++slot) if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) if (item->GetTemplate()->ItemLevel > _maxWeaponItemLevel) @@ -736,7 +736,7 @@ class instance_ulduar : public InstanceMapScript Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 612be3b71e8..35d11522580 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -355,7 +355,7 @@ class PlayerOrPetCheck bool operator()(WorldObject* object) const { if (object->GetTypeId() != TYPEID_PLAYER) - if (!object->ToCreature()->isPet()) + if (!object->ToCreature()->IsPet()) return true; return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index dfb12a03c33..023ef126dd3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -237,7 +237,7 @@ public: case EVENT_JUST_TRANSFORMED: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetInCombatWithZone(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); ScheduleSecondPhase(); return; case EVENT_SUMMON_BANSHEE: @@ -380,7 +380,7 @@ public: { ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY); - if (ingvar->getVictim()) + if (ingvar->GetVictim()) if (boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI* ai = CAST_AI(boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI, ingvar->AI())) ai->StartZombiePhase(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 896421909ad..90a1a3b1d69 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -87,7 +87,7 @@ public: { npc_frost_tombAI(Creature* creature) : ScriptedAI(creature) { - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summon = me->ToTempSummon()->GetSummoner()) DoCast(summon, SPELL_FROST_TOMB, true); @@ -154,7 +154,7 @@ public: { for (std::list<Creature*>::iterator itr = runemages.begin(); itr != runemages.end(); ++itr) { - if ((*itr)->isAlive() && (*itr)->IsWithinLOSInMap(me)) + if ((*itr)->IsAlive() && (*itr)->IsWithinLOSInMap(me)) (*itr)->AI()->AttackStart(who); } } @@ -165,7 +165,7 @@ public: { for (std::list<Creature*>::iterator itr = strategists.begin(); itr != strategists.end(); ++itr) { - if ((*itr)->isAlive() && (*itr)->IsWithinLOSInMap(me)) + if ((*itr)->IsAlive() && (*itr)->IsWithinLOSInMap(me)) (*itr)->AI()->AttackStart(who); } } @@ -324,7 +324,7 @@ public: } me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); events.ScheduleEvent(EVENT_DECREPIFY, urand(4, 6)*IN_MILLISECONDS); break; } @@ -351,7 +351,7 @@ class spell_frost_tomb : public SpellScriptLoader { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_DEATH) if (Unit* caster = GetCaster()) - if (caster->ToCreature() && caster->isAlive()) + if (caster->ToCreature() && caster->IsAlive()) caster->ToCreature()->DespawnOrUnsummon(1000); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 75f643286b2..0331606240f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -126,7 +126,7 @@ public: Talk(YELL_SKARVALD_AGGRO); Unit* dalronn = Unit::GetUnit(*me, instance->GetData64(DATA_DALRONN)); - if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) + if (dalronn && dalronn->IsAlive() && !dalronn->GetVictim()) dalronn->getThreatManager().addThreat(who, 0.0f); instance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); @@ -226,7 +226,7 @@ public: if (StoneStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_STONE_STRIKE); + DoCast(me->GetVictim(), SPELL_STONE_STRIKE); StoneStrike_Timer = 5000+rand()%5000; } else StoneStrike_Timer -= diff; @@ -291,7 +291,7 @@ public: if (!ghost && instance) { Unit* skarvald = Unit::GetUnit(*me, instance->GetData64(DATA_SKARVALD)); - if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) + if (skarvald && skarvald->IsAlive() && !skarvald->GetVictim()) skarvald->getThreatManager().addThreat(who, 0.0f); AggroYell_Timer = 5000; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 562aa5a3848..536e7293b69 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -116,7 +116,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) return player; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 4f7f0e844bb..914d276f696 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -64,15 +64,15 @@ public: switch (fm_Type) { case 1: - instance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_1, me->IsAlive() ? NOT_STARTED : DONE); break; case 2: - instance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_2, me->IsAlive() ? NOT_STARTED : DONE); break; case 3: - instance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_3, me->IsAlive() ? NOT_STARTED : DONE); break; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 8e726c10fca..07567eb83da 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -134,19 +134,19 @@ public: instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FRENZIED_WORGEN)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); GameObject* go = instance->instance->GetGameObject(instance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); @@ -190,7 +190,7 @@ public: return; Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DisappearAndDie(); if (uiArcingSmashTimer <= diff) @@ -221,7 +221,7 @@ public: if (instance) instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DisappearAndDie(); } @@ -244,7 +244,7 @@ public: move = Sequence[AddCount++]; //send orb to summon spot Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); - if (pOrb && pOrb->isAlive()) + if (pOrb && pOrb->IsAlive()) { if (currentPhase == PHASE_NONE) pOrb->CastSpell(me, SPELL_ORB_VISUAL, true); @@ -307,7 +307,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -320,7 +320,7 @@ public: if (uiChainLightingTimer <= diff) { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTING); uiChainLightingTimer = 5000 + rand() % 5000; } else uiChainLightingTimer -= diff; @@ -420,7 +420,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -433,7 +433,7 @@ public: if (uiMortalWoundTimer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); uiMortalWoundTimer = 3000 + rand() % 4000; } else uiMortalWoundTimer -= diff; @@ -536,7 +536,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -549,13 +549,13 @@ public: if (uiStompTimer <= diff) { - DoCast(me->getVictim(), SPELL_STOMP); + DoCast(me->GetVictim(), SPELL_STOMP); uiStompTimer = 8000 + rand() % 4000; } else uiStompTimer -= diff; if (uiGoreTimer <= diff) { - DoCast(me->getVictim(), SPELL_GORE); + DoCast(me->GetVictim(), SPELL_GORE); uiGoreTimer = 13000 + rand() % 4000; } else uiGoreTimer -= diff; @@ -656,7 +656,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -827,7 +827,7 @@ public: InstanceScript* instance = go->GetInstanceScript(); Creature* pPalehoof = Unit::GetCreature(*go, instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) { go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); go->SetGoState(GO_STATE_ACTIVE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 8ff0c798f00..2065277eb7c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -287,7 +287,7 @@ public: GetCreatureListWithEntryInGrid(lspectatorList, me, CREATURE_SPECTATOR, 100.0f); for (std::list<Creature*>::iterator itr = lspectatorList.begin(); itr != lspectatorList.end(); ++itr) { - if ((*itr)->isAlive()) + if ((*itr)->IsAlive()) { (*itr)->SetStandState(UNIT_STAND_STATE_STAND); (*itr)->SetWalk(false); @@ -365,7 +365,7 @@ public: if (sinsterStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_SINSTER_STRIKE); + DoCast(me->GetVictim(), SPELL_SINSTER_STRIKE); sinsterStrikeTimer = urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); } else @@ -607,7 +607,7 @@ class npc_scourge_hulk : public CreatureScript if (mightyBlow <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) if (!victim->HasUnitState(UNIT_STATE_STUNNED)) // Prevent knocking back a ritual player DoCast(victim, SPELL_MIGHTY_BLOW); mightyBlow = urand(12000, 17000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index f4c65216f4a..33cf1a96f80 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -266,13 +266,13 @@ public: if (m_uiFetidRot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FETID_ROT); + DoCast(me->GetVictim(), SPELL_FETID_ROT); m_uiFetidRot_Timer = urand(10000, 15000); } else m_uiFetidRot_Timer -= diff; if (m_uiDarkSlash_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DARK_SLASH); + DoCast(me->GetVictim(), SPELL_DARK_SLASH); m_uiDarkSlash_Timer = urand(30000, 35000); } else m_uiDarkSlash_Timer -= diff; @@ -299,7 +299,7 @@ public: if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SPIRIT_STRIKE); + DoCast(me->GetVictim(), SPELL_SPIRIT_STRIKE); m_uiAbility_HALDOR_Timer = 5000; // overtime } else m_uiAbility_HALDOR_Timer -= diff; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index baed96453dc..d2d6a4b648f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -92,7 +92,7 @@ class boss_emalon : public CreatureScript // AttackStart has NULL-check for victim if (summoned->AI()) - summoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->GetVictim()); } void EnterCombat(Unit* who) @@ -102,7 +102,7 @@ class boss_emalon : public CreatureScript for (std::list<uint64>::const_iterator itr = summons.begin(); itr != summons.end(); ++itr) { Creature* minion = Unit::GetCreature(*me, *itr); - if (minion && minion->isAlive() && !minion->getVictim() && minion->AI()) + if (minion && minion->IsAlive() && !minion->GetVictim() && minion->AI()) minion->AI()->AttackStart(who); } } @@ -142,7 +142,7 @@ class boss_emalon : public CreatureScript if (!summons.empty()) { Creature* minion = Unit::GetCreature(*me, Trinity::Containers::SelectRandomContainerElement(summons)); - if (minion && minion->isAlive()) + if (minion && minion->IsAlive()) { minion->CastSpell(me, SPELL_OVERCHARGED, true); minion->SetFullHealth(); @@ -195,7 +195,7 @@ class mob_tempest_minion : public CreatureScript { if (Creature* emalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { - if (emalon->isAlive()) + if (emalon->IsAlive()) { emalon->SummonCreature(MOB_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); Talk(EMOTE_MINION_RESPAWN); @@ -210,7 +210,7 @@ class mob_tempest_minion : public CreatureScript if (Creature* pEmalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { - if (!pEmalon->getVictim() && pEmalon->AI()) + if (!pEmalon->GetVictim() && pEmalon->AI()) pEmalon->AI()->AttackStart(who); } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 9dbb10be601..f08f42be265 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -84,12 +84,12 @@ public: if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { - if (!pGuard1->isAlive()) + if (!pGuard1->IsAlive()) pGuard1->Respawn(); } if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { - if (!pGuard2->isAlive()) + if (!pGuard2->IsAlive()) pGuard2->Respawn(); } } @@ -109,13 +109,13 @@ public: if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_NON_ATTACKABLE); - if (!pGuard1->getVictim() && pGuard1->AI()) + if (!pGuard1->GetVictim() && pGuard1->AI()) pGuard1->AI()->AttackStart(who); } if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_NON_ATTACKABLE); - if (!pGuard2->getVictim() && pGuard2->AI()) + if (!pGuard2->GetVictim() && pGuard2->AI()) pGuard2->AI()->AttackStart(who); } } @@ -157,8 +157,8 @@ public: { if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { - if (!pGuard1->isAlive() && !pGuard2->isAlive()) - DoCast(me->getVictim(), SPELL_STORMSTRIKE); + if (!pGuard1->IsAlive() && !pGuard2->IsAlive()) + DoCast(me->GetVictim(), SPELL_STORMSTRIKE); } } } @@ -179,7 +179,7 @@ public: //If one of the adds is dead spawn heals faster Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0); Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0); - uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; + uiChainHealTimer = ((pGuard1 && !pGuard1->IsAlive()) || (pGuard2 && !pGuard2->IsAlive()) ? 3000 : 8000) + rand()%3000; } } else uiChainHealTimer -= diff; @@ -191,7 +191,7 @@ public: if (uiEarthShockTimer <= diff) { - DoCast(me->getVictim(), SPELL_EARTH_SHOCK); + DoCast(me->GetVictim(), SPELL_EARTH_SHOCK); uiEarthShockTimer = urand(8000, 13000); } else uiEarthShockTimer -= diff; @@ -237,11 +237,11 @@ public: return me->GetGUID(); Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0); - if (pGuard1 && pGuard1->isAlive() && !pGuard1->HealthAbovePct(75)) + if (pGuard1 && pGuard1->IsAlive() && !pGuard1->HealthAbovePct(75)) return pGuard1->GetGUID(); Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0); - if (pGuard2 && pGuard2->isAlive() && !pGuard2->HealthAbovePct(75)) + if (pGuard2 && pGuard2->IsAlive() && !pGuard2->HealthAbovePct(75)) return pGuard2->GetGUID(); return 0; @@ -312,19 +312,19 @@ public: if (uiStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_STRIKE); + DoCast(me->GetVictim(), SPELL_STRIKE); uiStrikeTimer = urand(4000, 8000); } else uiStrikeTimer -= diff; if (uiHowlingScreechTimer <= diff) { - DoCast(me->getVictim(), SPELL_HOWLING_SCREECH); + DoCast(me->GetVictim(), SPELL_HOWLING_SCREECH); uiHowlingScreechTimer = urand(8000, 13000); } else uiHowlingScreechTimer -= diff; if (uiGushingWoundTimer <= diff) { - DoCast(me->getVictim(), SPELL_GUSHING_WOUND); + DoCast(me->GetVictim(), SPELL_GUSHING_WOUND); uiGushingWoundTimer = urand(7000, 12000); } else uiGushingWoundTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index db70177f8a0..8e43baecdb1 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -153,7 +153,7 @@ public: void DoAction(int32 param) { - if (!me->isAlive()) + if (!me->IsAlive()) return; switch (param) @@ -192,7 +192,7 @@ public: } me->SetVisible(true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } uint32 GetData(uint32 type) const @@ -245,7 +245,7 @@ public: { for (std::list<uint64>::const_iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr) if (Creature* temp = Unit::GetCreature(*me, *itr)) - if (temp->isAlive()) + if (temp->IsAlive()) { bIsWaterElementsAlive = true; break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 187cf5d6b30..bca65240794 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -110,19 +110,19 @@ public: if (uiFireboltTimer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBOLT); + DoCast(me->GetVictim(), SPELL_FIREBOLT); uiFireboltTimer = urand(5000, 13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { - DoCast(me->getVictim(), SPELL_FLAME_BREATH); + DoCast(me->GetVictim(), SPELL_FLAME_BREATH); uiFlameBreathTimer = urand(10000, 15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { - DoCast(me->getVictim(), SPELL_LAVA_BURN); + DoCast(me->GetVictim(), SPELL_LAVA_BURN); uiLavaBurnTimer = urand(15000, 23000); } @@ -130,7 +130,7 @@ public: { if (uiCauterizingFlamesTimer <= diff) { - DoCast(me->getVictim(), SPELL_CAUTERIZING_FLAMES); + DoCast(me->GetVictim(), SPELL_CAUTERIZING_FLAMES); uiCauterizingFlamesTimer = urand(10000, 16000); } else uiCauterizingFlamesTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index d308c6c696b..59ff6873a56 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -110,7 +110,7 @@ public: if (uiCorrosiveSalivaTimer <= diff) { - DoCast(me->getVictim(), SPELL_CORROSIVE_SALIVA); + DoCast(me->GetVictim(), SPELL_CORROSIVE_SALIVA); uiCorrosiveSalivaTimer = 10000; } else uiCorrosiveSalivaTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index b14a9e0dec5..d05f475b22f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -171,7 +171,7 @@ public: { if (uiArcaneBuffet_Timer < uiDiff) { - DoCast(me->getVictim(), SPELL_ARCANE_BUFFET); + DoCast(me->GetVictim(), SPELL_ARCANE_BUFFET); uiArcaneBuffet_Timer = 0; } else uiArcaneBuffet_Timer -= uiDiff; @@ -288,8 +288,8 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource()->isAlive()) - DoTeleportPlayer(i->getSource(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), i->getSource()->GetOrientation()); + if (i->GetSource()->IsAlive()) + DoTeleportPlayer(i->GetSource(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), i->GetSource()->GetOrientation()); } uiSummonPlayers_Timer = urand(33000, 35000); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 0f150fe88b8..a237845cf89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -130,7 +130,7 @@ public: if (SpellSummonVoidTimer <= diff) { - DoCast(me->getVictim(), SPELL_SUMMON_VOID_SENTRY, false); + DoCast(me->GetVictim(), SPELL_SUMMON_VOID_SENTRY, false); SpellSummonVoidTimer = 20000; } else SpellSummonVoidTimer -=diff; @@ -143,7 +143,7 @@ public: if (SpellShroudOfDarknessTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHROUD_OF_DARKNESS); + DoCast(me->GetVictim(), SPELL_SHROUD_OF_DARKNESS); SpellShroudOfDarknessTimer = 20000; } else SpellShroudOfDarknessTimer -=diff; @@ -193,7 +193,7 @@ public: void JustSummoned(Creature* summon) { - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); summon->SetPhaseMask(17, true); } diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index df79366e6cd..ef96b1ea86f 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -671,11 +671,11 @@ public: Map::PlayerList const &players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player->isGameMaster()) + Player* player = itr->GetSource(); + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) return false; } @@ -796,7 +796,7 @@ public: for (std::set<uint64>::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr) { Creature* creature = instance->GetCreature(*itr); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) creature->CastSpell(creature, SPELL_ARCANE_LIGHTNING, true); // Who should cast the spell? } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index fbbf3fa3df5..303a1449644 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -844,7 +844,7 @@ public: { if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); uiCleaveTimer = 5000; } else uiCleaveTimer -= diff; @@ -861,13 +861,13 @@ public: { if (uiBrutalStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_BRUTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_BRUTAL_STRIKE); uiBrutalStrikeTimer = 5000; } else uiBrutalStrikeTimer -= diff; if (uiSunderArmorTimer <= diff) { - DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); + DoCast(me->GetVictim(), SPELL_SUNDER_ARMOR); uiSunderArmorTimer = urand(8000, 10000); } else uiSunderArmorTimer -= diff; @@ -1054,7 +1054,7 @@ public: if (uiConcussionBlowTimer <= diff) { - DoCast(me->getVictim(), SPELL_CONCUSSION_BLOW); + DoCast(me->GetVictim(), SPELL_CONCUSSION_BLOW); uiConcussionBlowTimer = 5000; } else uiConcussionBlowTimer -= diff; @@ -1249,7 +1249,7 @@ public: if (uiMortalStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = 5000; } else uiMortalStrikeTimer -= diff; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index b1091013270..fc9d79296cb 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -221,7 +221,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(11957) == QUEST_STATUS_INCOMPLETE) @@ -267,7 +267,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_ACES_HIGH) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_ACES_HIGH_DAILY) == QUEST_STATUS_INCOMPLETE) //It's the same dragon for both quests. @@ -562,7 +562,7 @@ public: go_caribou->SetLootState(GO_JUST_DEACTIVATED); if (TempSummon* summon = me->ToTempSummon()) - if (summon->isSummon()) + if (summon->IsSummon()) if (Unit* temp = summon->GetSummoner()) if (Player* player = temp->ToPlayer()) player->KilledMonsterCredit(me->GetEntry(), 0); @@ -1213,7 +1213,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE && creature->GetAreaId() == 4128) @@ -1266,7 +1266,7 @@ public: if (uiType != POINT_MOTION_TYPE) return; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->arthasInPosition = true; } @@ -1298,7 +1298,7 @@ public: me->AddUnitState(UNIT_STATE_STUNNED); me->CastSpell(me, SPELL_STUN, true); - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->arlosInPosition = true; } @@ -1355,7 +1355,7 @@ public: if (uiType != POINT_MOTION_TYPE) return; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->talbotInPosition = true; } @@ -1378,19 +1378,19 @@ public: { if (shadowBoltTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT); shadowBoltTimer = urand(5000, 12000); } else shadowBoltTimer -= uiDiff; if (deflectionTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_DEFLECTION); + DoCast(me->GetVictim(), SPELL_DEFLECTION); deflectionTimer = urand(20000, 25000); } else deflectionTimer -= uiDiff; if (soulBlastTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SOUL_BLAST); + DoCast(me->GetVictim(), SPELL_SOUL_BLAST); soulBlastTimer = urand (12000, 18000); } else soulBlastTimer -= uiDiff; } @@ -1466,7 +1466,7 @@ public: me->AddUnitState(UNIT_STATE_STUNNED); me->CastSpell(me, SPELL_STUN, true); - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->GetAI())->leryssaInPosition = true; bDone = true; @@ -1474,7 +1474,7 @@ public: else { me->SetStandState(UNIT_STAND_STATE_SIT); - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) summoner->SetStandState(UNIT_STAND_STATE_SIT); phaseTimer = 1500; @@ -1491,7 +1491,7 @@ public: switch (phase) { case 1: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) thassarian->AI()->Talk(SAY_THASSARIAN_4); @@ -1504,7 +1504,7 @@ public: ++phase; break; case 3: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) thassarian->AI()->Talk(SAY_THASSARIAN_5); @@ -1517,7 +1517,7 @@ public: ++phase; break; case 5: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) thassarian->AI()->Talk(SAY_THASSARIAN_6); @@ -1531,7 +1531,7 @@ public: ++phase; break; case 7: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) { @@ -2473,7 +2473,7 @@ public: if (player->HasAura(SPELL_RIGHTEOUS_VISION) && player->GetQuestStatus(QUEST_THE_HUNT_IS_ON) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, charGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(uiGossipText, creature->GetGUID()); diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index d3d77cdd9da..e629ade9f52 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -80,7 +80,7 @@ public: Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); - if (!player || player->isGameMaster() || player->IsBeingTeleported() || + if (!player || player->IsGameMaster() || player->IsBeingTeleported() || // If player has Disguise aura for quest A Meeting With The Magister or An Audience With The Arcanist, do not teleport it away but let it pass player->HasAura(SPELL_SUNREAVER_DISGUISE_FEMALE) || player->HasAura(SPELL_SUNREAVER_DISGUISE_MALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_FEMALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_MALE)) diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index ed7354acb50..44bb405cf59 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -53,7 +53,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestRewardStatus(QUEST_RETURN_TO_AG_A) || player->GetQuestRewardStatus(QUEST_RETURN_TO_AG_H)) diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index e8eddea6ef7..3d65ced5736 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -75,7 +75,7 @@ public: if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 50.0f)) summoned->AI()->AttackStart(Mrfloppy); else - summoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->GetVictim()); } void WaypointReached(uint32 waypointId) @@ -664,7 +664,7 @@ class npc_venture_co_straggler : public CreatureScript if (uiChopTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CHOP); + DoCast(me->GetVictim(), SPELL_CHOP); uiChopTimer = urand(10000, 12000); } else @@ -692,6 +692,146 @@ class npc_venture_co_straggler : public CreatureScript } }; +/*###### +## Quest A Blade Fit For A Champion +######*/ + +enum LakeFrog +{ + // Spells + SPELL_WARTSBGONE_LIP_BALM = 62574, + SPELL_FROG_LOVE = 62537, // for 1 minute ! + SPELL_WARTS = 62581, + SPELL_MAIDEN_OF_ASHWOOD_LAKE_TRANSFORM = 62550, + SPELL_SUMMON_ASHWOOD_BRAND = 62554, + + // Items + ITEM_WARTS_B_GONE_LIP_BALM = 44986, + + // Creature + NPC_LAKE_FROG = 33211, + NPC_LAKE_FROG_QUEST = 33224, + + // Text + SAY_MAIDEN_0 = 0, + SAY_MAIDEN_1 = 1 +}; + +class npc_lake_frog : public CreatureScript +{ + public: + npc_lake_frog() : CreatureScript("npc_lake_frog") { } + + struct npc_lake_frogAI : public ScriptedAI + { + npc_lake_frogAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() + { + _following = false; + _runningScript = false; + _phase = 0; + if (me->GetEntry() == NPC_LAKE_FROG_QUEST) + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + void UpdateAI(uint32 diff) + { + if (_following) + if (!me->HasAura(SPELL_FROG_LOVE)) + me->DespawnOrUnsummon(0); + + if (_runningScript) + { + if (_scriptTimer <= diff) + { + switch (_phase) + { + case 0: + DoCast(me, SPELL_MAIDEN_OF_ASHWOOD_LAKE_TRANSFORM); + me->SetEntry(33220); + _scriptTimer = 2000; + ++_phase; + break; + case 1: + Talk(SAY_MAIDEN_0); + _scriptTimer = 3000; + ++_phase; + break; + case 2: + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + _scriptTimer = 25000; + ++_phase; + break; + case 3: + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + _scriptTimer = 2000; + ++_phase; + break; + case 4: + Talk(SAY_MAIDEN_1); + _scriptTimer = 4000; + ++_phase; + break; + case 5: + _runningScript = false; + me->DespawnOrUnsummon(0); + break; + } + } + else if (_scriptTimer) + _scriptTimer -= diff; + } + } + + void ReceiveEmote(Player* player, uint32 emote) + { + if (_following || _runningScript) + return; + + if (emote == TEXT_EMOTE_KISS && me->IsWithinDistInMap(player, 30.0f) && player->HasItemCount(ITEM_WARTS_B_GONE_LIP_BALM, 1, false)) + { + if (!player->HasAura(SPELL_WARTSBGONE_LIP_BALM)) + player->AddAura(SPELL_WARTS, player); + else + { + player->RemoveAura(SPELL_WARTSBGONE_LIP_BALM); + + if (me->GetEntry() == NPC_LAKE_FROG) + { + me->AddAura(SPELL_FROG_LOVE, me); + me->GetMotionMaster()->MoveFollow(player, 0.3f, frand(M_PI/2, M_PI + (M_PI/2))); + _following = true; + } + else if (me->GetEntry() == NPC_LAKE_FROG_QUEST) + { + me->GetMotionMaster()->MoveIdle(); + me->SetFacingToObject(player); + _runningScript = true; + _scriptTimer = 2000; + } + } + } + } + + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + { + DoCast(player, SPELL_SUMMON_ASHWOOD_BRAND); + } + + private: + bool _following; + bool _runningScript; + uint32 _scriptTimer; + uint8 _phase; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_lake_frogAI(creature); + } +}; + void AddSC_grizzly_hills() { new npc_emily(); @@ -702,4 +842,5 @@ void AddSC_grizzly_hills() new npc_wounded_skirmisher(); new npc_lightning_sentry(); new npc_venture_co_straggler(); + new npc_lake_frog(); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 268e904e292..32bc2f6e424 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -178,7 +178,7 @@ public: { uint64 summonerGUID = 0; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (summoner->GetTypeId() == TYPEID_PLAYER) summonerGUID = summoner->GetGUID(); @@ -230,7 +230,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_REPORTS_FROM_THE_FIELD) == QUEST_STATUS_INCOMPLETE) @@ -340,7 +340,7 @@ public: { if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) { - if (player->isAlive()) + if (player->IsAlive()) { summon->SetWalk(false); summon->GetMotionMaster()->MovePoint(0, afCenter[0], afCenter[1], afCenter[2]); diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 0447d70b502..f5f832bcb86 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -67,7 +67,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_THE_STORY_THUS_FAR) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 57228595b9b..adf709ee304 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -130,7 +130,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) == QUEST_STATUS_INCOMPLETE) @@ -201,7 +201,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_MAKING_PEACE) == QUEST_STATUS_INCOMPLETE) @@ -262,7 +262,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_FREYA_PACT) == QUEST_STATUS_INCOMPLETE) @@ -844,7 +844,7 @@ public: std::list<Creature*> saboteurs; caster->GetCreatureListWithEntryInGrid(saboteurs, NPC_SABOTEUR, 200.0f); for (std::list<Creature*>::iterator itr = saboteurs.begin(); itr != saboteurs.end(); ++itr) - if ((*itr)->isAlive()) + if ((*itr)->IsAlive()) // Lifeforce has a cast duration, it should be cast at all saboteurs one by one presence->CastSpell((*itr), SPELL_LIFEFORCE, false); } diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index ba725d2dda4..aa6c53c188b 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -202,7 +202,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_BITTER_DEPARTURE) == QUEST_STATUS_INCOMPLETE) @@ -252,15 +252,15 @@ public: bool OnGossipHello(Player* player, Creature* creature) { //Quest Menu - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if ( creature->isTrainer() ) + if ( creature->IsTrainer() ) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if ( creature->isVendor() ) + if ( creature->IsVendor() ) if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 1b944f9babb..43b5eaefc62 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -117,10 +117,10 @@ class npc_wg_demolisher_engineer : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (canBuild(creature)) + if (CanBuild(creature)) { if (player->HasAura(SPELL_CORPORAL)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_DEMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -142,7 +142,7 @@ class npc_wg_demolisher_engineer : public CreatureScript { player->CLOSE_GOSSIP_MENU(); - if (canBuild(creature)) + if (CanBuild(creature)) { switch (action - GOSSIP_ACTION_INFO_DEF) { @@ -163,7 +163,7 @@ class npc_wg_demolisher_engineer : public CreatureScript } private: - bool canBuild(Creature* creature) + bool CanBuild(Creature* creature) { Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); if (!wintergrasp) @@ -188,7 +188,7 @@ class npc_wg_spirit_guide : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); @@ -244,7 +244,7 @@ class npc_wg_queue : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); @@ -334,14 +334,14 @@ class npc_wg_quest_giver : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); if (!wintergrasp) return true; - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) { QuestRelationBounds objectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry()); QuestRelationBounds objectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(creature->GetEntry()); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 1d04a9b163c..825f1804e3c 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -212,7 +212,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -660,7 +660,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { Talk(SAY_CALL_FOR_HELP); - //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? + //DoCast(me->GetVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) uiWhisker = pWhisker->GetGUID(); @@ -675,12 +675,12 @@ public: switch (summon->GetEntry()) { case NPC_WHISKER: - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); break; case NPC_HUNGRY_PENGUIN: if (Unit* pAffected = Unit::GetUnit(*me, AffectedGUID)) { - if (pAffected->isAlive()) + if (pAffected->IsAlive()) summon->AI()->AttackStart(pAffected); } break; @@ -837,7 +837,7 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276f) + if (me->GetVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) @@ -857,13 +857,13 @@ public: if (uiCleaveTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); uiCleaveTimer = 9000; } else uiCleaveTimer -= uiDiff; if (uiCorrodeFleshTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CORRODE_FLESH); + DoCast(me->GetVictim(), SPELL_CORRODE_FLESH); uiCorrodeFleshTimer = 6000; } else uiCorrodeFleshTimer -= uiDiff; @@ -957,7 +957,7 @@ public: if (!UpdateVictim()) return; - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { if (victim->GetPositionZ() >= 286.276f) { @@ -988,7 +988,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_KNOCK_AWAY); } uiKnockAwayTimer = 10000; @@ -998,7 +998,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_STINKY_BEARD); } uiStinkyBeardTimer = 15000; @@ -1104,7 +1104,7 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276f) + if (me->GetVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) @@ -1139,8 +1139,8 @@ public: if (temp->GetPositionZ() >= 287.00f) continue; - if (temp->getVictim()) - temp->GetMotionMaster()->MoveChase(temp->getVictim()); + if (temp->GetVictim()) + temp->GetMotionMaster()->MoveChase(temp->GetVictim()); } } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index fe3489b4a7e..21ad544dceb 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -65,7 +65,7 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() case NA_NPC_GUARD_14: case NA_NPC_GUARD_15: if (Creature const* const cr = HashMapHolder<Creature>::Find(itr->second)) - if (cr->isAlive()) + if (cr->IsAlive()) ++cnt; break; default: diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 0fb49dfc284..698e5c2eb43 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -82,39 +82,39 @@ public: switch (myClass) { case CLASS_WARRIOR: - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); Class_Timer = 6000; break; case CLASS_PALADIN: - DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE); + DoCast(me->GetVictim(), SPELL_HAMMER_OF_JUSTICE); Class_Timer = 6000; break; case CLASS_HUNTER: - DoCast(me->getVictim(), SPELL_FREEZING_TRAP); + DoCast(me->GetVictim(), SPELL_FREEZING_TRAP); Class_Timer = 20000; break; case CLASS_ROGUE: - DoCast(me->getVictim(), SPELL_HEMORRHAGE); + DoCast(me->GetVictim(), SPELL_HEMORRHAGE); Class_Timer = 10000; break; case CLASS_PRIEST: - DoCast(me->getVictim(), SPELL_MIND_FLAY); + DoCast(me->GetVictim(), SPELL_MIND_FLAY); Class_Timer = 5000; break; case CLASS_SHAMAN: - DoCast(me->getVictim(), SPELL_FROSTSHOCK); + DoCast(me->GetVictim(), SPELL_FROSTSHOCK); Class_Timer = 8000; break; case CLASS_MAGE: - DoCast(me->getVictim(), SPELL_FIREBALL); + DoCast(me->GetVictim(), SPELL_FIREBALL); Class_Timer = 5000; break; case CLASS_WARLOCK: - DoCast(me->getVictim(), SPELL_CURSE_OF_AGONY); + DoCast(me->GetVictim(), SPELL_CURSE_OF_AGONY); Class_Timer = 20000; break; case CLASS_DRUID: - DoCast(me->getVictim(), SPELL_MOONFIRE); + DoCast(me->GetVictim(), SPELL_MOONFIRE); Class_Timer = 10000; break; } @@ -329,7 +329,7 @@ public: if (Mortal_Strike_timer <= diff) { - DoCast(me->getVictim(), SPELL_AV_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_AV_MORTAL_STRIKE); Mortal_Strike_timer = urand(10, 30) * 1000; } else Mortal_Strike_timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 00ec9b9fe4a..844882e6d1b 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -103,8 +103,8 @@ public: Map* map = me->GetMap(); Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* i_pl = i->getSource()) - if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(me, 45))) + if (Player* i_pl = i->GetSource()) + if (i_pl->IsAlive() && (dist = i_pl->IsWithinDist(me, 45))) { i_pl->RemoveAurasDueToSpell(SPELL_INHIBITMAGIC); me->AddAura(SPELL_INHIBITMAGIC, i_pl); @@ -142,7 +142,7 @@ public: { // Summon Focus Fire & Emote Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (target && target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) { FocusedTargetGUID = target->GetGUID(); me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index f26760a82b7..9d5ee14ec65 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -166,13 +166,13 @@ public: if (Frostbolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTBOLT); + DoCast(me->GetVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = urand(4500, 6000); } else Frostbolt_Timer -= diff; if (FireBall_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBALL); + DoCast(me->GetVictim(), SPELL_FIREBALL); FireBall_Timer = urand(4500, 6000); } else FireBall_Timer -= diff; @@ -260,13 +260,13 @@ public: KillSelf(); return; } - if (!Shaffar->isInCombat()) + if (!Shaffar->IsInCombat()) Shaffar->AI()->AttackStart(who); } void JustSummoned(Creature* summoned) { - summoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->GetVictim()); } void UpdateAI(uint32 diff) @@ -277,7 +277,7 @@ public: if (Check_Timer <= diff) { Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); - if (!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat()) + if (!Shaffar || Shaffar->isDead() || !Shaffar->IsInCombat()) { KillSelf(); return; @@ -287,7 +287,7 @@ public: if (ArcaneBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_BOLT); + DoCast(me->GetVictim(), SPELL_ARCANE_BOLT); ArcaneBolt_Timer = urand(2000, 4500); } else ArcaneBolt_Timer -= diff; @@ -344,10 +344,10 @@ public: { if (isFireboltTurn) { - DoCast(me->getVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true); + DoCast(me->GetVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true); isFireboltTurn = false; }else{ - DoCast(me->getVictim(), SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true); + DoCast(me->GetVictim(), SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true); isFireboltTurn = true; } Cast_Timer = 3000; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index 4a9a98abcde..b9a2fc62e8e 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -89,7 +89,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { if (!Intro && me->IsWithinDistInMap(who, 100)) { diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index cd7f8e120de..e8968659ea4 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -79,7 +79,7 @@ public: IsBanished = true; Enraged = false; - if (instance && me->isAlive()) + if (instance && me->IsAlive()) { if (instance->GetData(TYPE_OVERSEER) != DONE) DoCast(me, SPELL_BANISH, true); @@ -179,7 +179,7 @@ public: if (CorrosiveAcid_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CORROSIVE_ACID); + DoCast(me->GetVictim(), SPELL_CORROSIVE_ACID); CorrosiveAcid_Timer = urand(15000, 25000); } else CorrosiveAcid_Timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index a067bbf92a0..a424de35e51 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -125,7 +125,7 @@ public: move = 500; return; } - if (!Vorpil->isInCombat() || Vorpil->isDead()) + if (!Vorpil->IsInCombat() || Vorpil->isDead()) { me->Kill(me); return; @@ -205,7 +205,7 @@ public: for (uint8 i = 0; i < 5; ++i) { Unit* Portal = Unit::GetUnit(*me, PortalsGuid[i]); - if (Portal && Portal->isAlive()) + if (Portal && Portal->IsAlive()) Portal->DealDamage(Portal, Portal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); PortalsGuid[i] = 0; } @@ -290,8 +290,8 @@ public: Map* map = me->GetMap(); Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* i_pl = i->getSource()) - if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) + if (Player* i_pl = i->GetSource()) + if (i_pl->IsAlive() && !i_pl->HasAura(SPELL_BANISH)) i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); me->SetPosition(VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0.0f); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index e09371bca13..786eb662a57 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -107,7 +107,7 @@ public: // Sonic Boom instant damage (needs core fix instead of this) void SpellHitTarget(Unit* target, const SpellInfo* spell) { - if (target && target->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) + if (target && target->IsAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) me->DealDamage(target, (target->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); } @@ -144,7 +144,7 @@ public: } else MurmursTouch_Timer -= diff; // Resonance - if (!SonicBoom && !(me->IsWithinMeleeRange(me->getVictim()))) + if (!SonicBoom && !(me->IsWithinMeleeRange(me->GetVictim()))) { if (Resonance_Timer <= diff) { @@ -157,7 +157,7 @@ public: if (MagneticPull_Timer <= diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) { DoCast(target, SPELL_MAGNETIC_PULL); MagneticPull_Timer = 15000+rand()%15000; @@ -174,7 +174,7 @@ public: ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) if (Unit* target = Unit::GetUnit(*me, (*i)->getUnitGuid())) - if (target->isAlive() && !me->IsWithinDist(target, 35, false)) + if (target->IsAlive() && !me->IsWithinDist(target, 35, false)) DoCast(target, SPELL_THUNDERING_STORM, true); ThunderingStorm_Timer = 15000; } else ThunderingStorm_Timer -= diff; @@ -183,7 +183,7 @@ public: if (SonicShock_Timer <= diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) - if (target->isAlive()) + if (target->IsAlive()) DoCast(target, SPELL_SONIC_SHOCK); SonicShock_Timer = 10000+rand()%10000; } else SonicShock_Timer -= diff; @@ -192,12 +192,12 @@ public: // Select nearest most aggro target if top aggro too far if (!me->isAttackReady()) return; - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) { ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) if (Unit* target = Unit::GetUnit(*me, (*i)->getUnitGuid())) - if (target->isAlive() && me->IsWithinMeleeRange(target)) + if (target->IsAlive() && me->IsWithinMeleeRange(target)) { me->TauntApply(target); break; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index c850761f518..970b78a2cea 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -107,7 +107,7 @@ public: m_uiGrandmasterVorpil = creature->GetGUID(); break; case 18796: - if (creature->isAlive()) + if (creature->IsAlive()) { ++m_uiFelOverseerCount; TC_LOG_DEBUG(LOG_FILTER_TSCR, "Shadow Labyrinth: counting %u Fel Overseers.", m_uiFelOverseerCount); diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 5a292d165cc..858a80c9b9c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -155,7 +155,7 @@ public: { Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //only on alive players - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + if (target && target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER) targets.push_back(target); } @@ -203,13 +203,13 @@ public: if (ArcingSmashTimer <= diff) { - DoCast(me->getVictim(), SPELL_ARCING_SMASH); + DoCast(me->GetVictim(), SPELL_ARCING_SMASH); ArcingSmashTimer = 10000; } else ArcingSmashTimer -= diff; if (FelAcidTimer <= diff) { - DoCast(me->getVictim(), SPELL_FEL_ACID); + DoCast(me->GetVictim(), SPELL_FEL_ACID); FelAcidTimer = 25000; } else FelAcidTimer -= diff; @@ -226,8 +226,8 @@ public: { if (BewilderingStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_BEWILDERING_STRIKE); - float mt_threat = DoGetThreat(me->getVictim()); + DoCast(me->GetVictim(), SPELL_BEWILDERING_STRIKE); + float mt_threat = DoGetThreat(me->GetVictim()); if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) me->AddThreat(target, mt_threat); BewilderingStrikeTimer = 20000; @@ -235,14 +235,14 @@ public: if (EjectTimer <= diff) { - DoCast(me->getVictim(), SPELL_EJECT1); - DoModifyThreatPercent(me->getVictim(), -40); + DoCast(me->GetVictim(), SPELL_EJECT1); + DoModifyThreatPercent(me->GetVictim(), -40); EjectTimer = 15000; } else EjectTimer -= diff; if (AcidicWoundTimer <= diff) { - DoCast(me->getVictim(), SPELL_ACIDIC_WOUND); + DoCast(me->GetVictim(), SPELL_ACIDIC_WOUND); AcidicWoundTimer = 10000; } else AcidicWoundTimer -= diff; @@ -251,7 +251,7 @@ public: if (BloodboilCount < 5) // Only cast it five times. { //CastBloodboil(); // Causes issues on windows, so is commented out. - DoCast(me->getVictim(), SPELL_BLOODBOIL); + DoCast(me->GetVictim(), SPELL_BLOODBOIL); ++BloodboilCount; BloodboilTimer = 10000*BloodboilCount; } @@ -262,13 +262,13 @@ public: { if (AcidGeyserTimer <= diff) { - DoCast(me->getVictim(), SPELL_ACID_GEYSER); + DoCast(me->GetVictim(), SPELL_ACID_GEYSER); AcidGeyserTimer = 30000; } else AcidGeyserTimer -= diff; if (EjectTimer <= diff) { - DoCast(me->getVictim(), SPELL_EJECT2); + DoCast(me->GetVictim(), SPELL_EJECT2); EjectTimer = 15000; } else EjectTimer -= diff; } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 2048270f285..59419f6dcbd 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -424,8 +424,8 @@ public: DoResetThreat(); if (SelectTarget(SELECT_TARGET_RANDOM, 0)) { - me->AddThreat(me->getVictim(), 5000000.0f); - AttackStart(me->getVictim()); + me->AddThreat(me->GetVictim(), 5000000.0f); + AttackStart(me->GetVictim()); } } else if (!me->HasAura(SPELL_AZZINOTH_CHANNEL)) @@ -448,8 +448,8 @@ public: if (FlameBlastTimer <= diff) { - DoCast(me->getVictim(), SPELL_BLAZE_SUMMON, true); // appear at victim - DoCast(me->getVictim(), SPELL_FLAME_BLAST); + DoCast(me->GetVictim(), SPELL_BLAZE_SUMMON, true); // appear at victim + DoCast(me->GetVictim(), SPELL_FLAME_BLAST); FlameBlastTimer = 15000; // 10000 is official-like? DoZoneInCombat(); // in case someone is revived } else FlameBlastTimer -= diff; @@ -529,9 +529,9 @@ public: { if (FlightCount == 7) // change hover point { - if (me->getVictim()) + if (me->GetVictim()) { - me->SetInFront(me->getVictim()); + me->SetInFront(me->GetVictim()); me->StopMoving(); } EnterPhase(PHASE_FLIGHT); @@ -655,7 +655,7 @@ public: case PHASE_NORMAL: case PHASE_NORMAL_2: case PHASE_NORMAL_MAIEV: - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); Timer[EVENT_TAUNT] = 32000; Timer[EVENT_SHEAR] = urand(10, 25) * 1000; Timer[EVENT_FLAME_CRASH] = 20000; @@ -682,7 +682,7 @@ public: Timer[EVENT_FLAME_BURST] = 10000; Timer[EVENT_SHADOWDEMON] = 30000; Timer[EVENT_TRANSFORM_DEMON] = 60000; - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); break; case PHASE_TALK_SEQUENCE: Timer[EVENT_TALK_SEQUENCE] = 100; @@ -725,7 +725,7 @@ public: if (MaievGUID) { GETCRE(Maiev, MaievGUID); - if (Maiev && Maiev->isAlive()) + if (Maiev && Maiev->IsAlive()) Maiev->AI()->DoAction(NextPhase); } Phase = NextPhase; @@ -1039,12 +1039,12 @@ public: case EVENT_SHEAR: // no longer exists in 3.0f.2 - // DoCast(me->getVictim(), SPELL_SHEAR); + // DoCast(me->GetVictim(), SPELL_SHEAR); Timer[EVENT_SHEAR] = 25000 + (rand()%16 * 1000); break; case EVENT_FLAME_CRASH: - DoCast(me->getVictim(), SPELL_FLAME_CRASH); + DoCast(me->GetVictim(), SPELL_FLAME_CRASH); Timer[EVENT_FLAME_CRASH] = urand(30000, 40000); break; @@ -1061,7 +1061,7 @@ public: break; case EVENT_DRAW_SOUL: - DoCast(me->getVictim(), SPELL_DRAW_SOUL); + DoCast(me->GetVictim(), SPELL_DRAW_SOUL); Timer[EVENT_DRAW_SOUL] = urand(50000, 60000); break; @@ -1126,11 +1126,11 @@ public: { case EVENT_SHADOW_BLAST: me->GetMotionMaster()->Clear(false); - if (!me->IsWithinDistInMap(me->getVictim(), 50)||!me->IsWithinLOSInMap(me->getVictim())) - me->GetMotionMaster()->MoveChase(me->getVictim(), 30); + if (!me->IsWithinDistInMap(me->GetVictim(), 50)||!me->IsWithinLOSInMap(me->GetVictim())) + me->GetMotionMaster()->MoveChase(me->GetVictim(), 30); else me->GetMotionMaster()->MoveIdle(); - DoCast(me->getVictim(), SPELL_SHADOW_BLAST); + DoCast(me->GetVictim(), SPELL_SHADOW_BLAST); Timer[EVENT_SHADOW_BLAST] = 4000; break; case EVENT_SHADOWDEMON: @@ -1205,7 +1205,7 @@ public: else { GETUNIT(Illidan, IllidanGUID); - if (Illidan && Illidan->getVictim() == me) + if (Illidan && Illidan->GetVictim() == me) damage = me->CountPctFromMaxHealth(10); if (damage >= me->GetHealth()) damage = 0; @@ -1340,7 +1340,7 @@ public: } break; case EVENT_MAIEV_SHADOW_STRIKE: - DoCast(me->getVictim(), SPELL_SHADOW_STRIKE); + DoCast(me->GetVictim(), SPELL_SHADOW_STRIKE); Timer[EVENT_MAIEV_SHADOW_STRIKE] = 60000; break; case EVENT_MAIEV_TRAP: @@ -1352,9 +1352,9 @@ public: } else { - if (!me->IsWithinDistInMap(me->getVictim(), 40)) - me->GetMotionMaster()->MoveChase(me->getVictim(), 30); - DoCast(me->getVictim(), SPELL_THROW_DAGGER); + if (!me->IsWithinDistInMap(me->GetVictim(), 40)) + me->GetMotionMaster()->MoveChase(me->GetVictim(), 30); + DoCast(me->GetVictim(), SPELL_THROW_DAGGER); Timer[EVENT_MAIEV_THROW_DAGGER] = 2000; } break; @@ -1777,7 +1777,7 @@ public: EnterPhase(PHASE_TALK); else { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTNING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING); Timer = 30000; } } @@ -1850,7 +1850,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() { if (GETCRE(Akama, AkamaGUID)) { - if (!Akama->isAlive()) + if (!Akama->IsAlive()) Akama->Respawn(); else { @@ -2154,19 +2154,19 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetTypeId() != TYPEID_PLAYER) + if (me->GetVictim()->GetTypeId() != TYPEID_PLAYER) return; // Only cast the below on players. - if (!me->getVictim()->HasAura(SPELL_PARALYZE)) + if (!me->GetVictim()->HasAura(SPELL_PARALYZE)) { - TargetGUID = me->getVictim()->GetGUID(); - me->AddThreat(me->getVictim(), 10000000.0f); - DoCast(me->getVictim(), SPELL_PURPLE_BEAM, true); - DoCast(me->getVictim(), SPELL_PARALYZE, true); + TargetGUID = me->GetVictim()->GetGUID(); + me->AddThreat(me->GetVictim(), 10000000.0f); + DoCast(me->GetVictim(), SPELL_PURPLE_BEAM, true); + DoCast(me->GetVictim(), SPELL_PARALYZE, true); } // Kill our target if we're very close. - if (me->IsWithinDistInMap(me->getVictim(), 3)) - DoCast(me->getVictim(), SPELL_CONSUME_SOUL); + if (me->IsWithinDistInMap(me->GetVictim(), 3)) + DoCast(me->GetVictim(), SPELL_CONSUME_SOUL); } }; }; @@ -2233,23 +2233,23 @@ public: void DoMeleeAttackIfReady() { - if (me->isAttackReady() && me->IsWithinMeleeRange(me->getVictim())) + if (me->isAttackReady() && me->IsWithinMeleeRange(me->GetVictim())) { - if (!me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND) - && !me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) + if (!me->GetVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND) + && !me->GetVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) { if (Creature* illidan = Unit::GetCreature((*me), IllidanGUID))// summon only in 1. phase if (CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL) - me->CastSpell(me->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); // do not stack + me->CastSpell(me->GetVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); // do not stack } - me->AttackerStateUpdate(me->getVictim()); + me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } } void UpdateAI(uint32 diff) { - if (!me->getVictim()) + if (!me->GetVictim()) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) AttackStart(target); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index dc56f7abe07..8ac3046c07f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -165,7 +165,7 @@ public: for (uint8 i = 0; i < 3; ++i) { Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) + if (unit && unit->IsAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) { TargetGUID[i] = unit->GetGUID(); unit->CastSpell(unit, SPELL_TELEPORT_VISUAL, true); @@ -190,7 +190,7 @@ public: if (BeamTimer <= diff) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!target || !target->isAlive()) + if (!target || !target->IsAlive()) return; BeamTimer = 9000; @@ -266,13 +266,13 @@ public: if (ShriekTimer <= diff) { - DoCast(me->getVictim(), SPELL_SILENCING_SHRIEK); + DoCast(me->GetVictim(), SPELL_SILENCING_SHRIEK); ShriekTimer = 25000+rand()%10 * 1000; } else ShriekTimer -= diff; if (SaberTimer <= diff) { - DoCast(me->getVictim(), SPELL_SABER_LASH); + DoCast(me->GetVictim(), SPELL_SABER_LASH); SaberTimer = 25000+rand()%10 * 1000; } else SaberTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index a6432114ded..182b43fe0d0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -182,7 +182,7 @@ public: if (!who) return; - if (me->isInCombat()) + if (me->IsInCombat()) return; if (who->GetTypeId() != TYPEID_PLAYER) @@ -299,7 +299,7 @@ public: Timer = 1000; if (Phase == 3) { - if (!Essence->isAlive()) + if (!Essence->IsAlive()) DoCast(me, 7, true); else return; } @@ -455,7 +455,7 @@ public: for (; itr != threatlist.end(); ++itr) { Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) // Only alive players + if (unit && unit->IsAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) // Only alive players targets.push_back(unit); } if (targets.empty()) @@ -471,7 +471,7 @@ public: void UpdateAI(uint32 diff) { - if (me->isInCombat()) + if (me->IsInCombat()) { //Supposed to be cast on nearest target if (FixateTimer <= diff) @@ -590,14 +590,14 @@ public: if (SoulShockTimer <= diff) { - DoCast(me->getVictim(), SPELL_SOUL_SHOCK); + DoCast(me->GetVictim(), SPELL_SOUL_SHOCK); SoulShockTimer = 5000; } else SoulShockTimer -= diff; if (DeadenTimer <= diff) { me->InterruptNonMeleeSpells(false); - DoCast(me->getVictim(), SPELL_DEADEN); + DoCast(me->GetVictim(), SPELL_DEADEN); DeadenTimer = urand(25000, 35000); if (!(rand()%2)) { @@ -673,24 +673,24 @@ public: if (!CheckedAggro) { - AggroTargetGUID = me->getVictim()->GetGUID(); + AggroTargetGUID = me->GetVictim()->GetGUID(); CheckedAggro = true; } if (CheckTankTimer <= diff) { - if (me->getVictim()->GetGUID() != AggroTargetGUID) + if (me->GetVictim()->GetGUID() != AggroTargetGUID) { Talk(ANGER_SAY_BEFORE); DoCast(me, SPELL_SELF_SEETHE, true); - AggroTargetGUID = me->getVictim()->GetGUID(); + AggroTargetGUID = me->GetVictim()->GetGUID(); } CheckTankTimer = 2000; } else CheckTankTimer -= diff; if (SoulScreamTimer <= diff) { - DoCast(me->getVictim(), SPELL_SOUL_SCREAM); + DoCast(me->GetVictim(), SPELL_SOUL_SCREAM); SoulScreamTimer = urand(9000, 11000); if (!(rand()%3)) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 79b8213fff3..ec29dd628bf 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -183,7 +183,7 @@ public: if (CheckTimer <= diff) { Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && Shade->isAlive() && me->isAlive()) + if (Shade && Shade->IsAlive() && me->IsAlive()) { if (me->IsWithinDist(Shade, 20, false)) { @@ -425,7 +425,7 @@ public: void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; if (IsBanished) @@ -473,7 +473,7 @@ public: if (AkamaGUID) { Creature* Akama = Unit::GetCreature((*me), AkamaGUID); - if (Akama && Akama->isAlive()) + if (Akama && Akama->IsAlive()) { IsBanished = false; me->GetMotionMaster()->Clear(false); @@ -498,7 +498,7 @@ public: if (AkamaGUID) { Creature* Akama = Unit::GetCreature((*me), AkamaGUID); - if (Akama && Akama->isAlive()) + if (Akama && Akama->IsAlive()) { //10 % less health every few seconds. me->DealDamage(Akama, Akama->GetMaxHealth()/10, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -536,7 +536,7 @@ public: void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade && Shade->isAlive()) + if (Shade && Shade->IsAlive()) CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(); else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama."); } @@ -544,7 +544,7 @@ void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer void mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade && Shade->isAlive()) + if (Shade && Shade->IsAlive()) CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(me->GetGUID()); else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama."); } @@ -568,7 +568,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (player->isAlive()) + if (player->IsAlive()) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(907, creature->GetGUID()); @@ -720,7 +720,7 @@ public: BrokenList.clear(); HasYelledOnce = false; Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && Shade->isAlive()) + if (Shade && Shade->IsAlive()) CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->HasKilledAkama = true; summons.DespawnAll(); } @@ -739,7 +739,7 @@ public: if (ShadeGUID && !StartCombat) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade && Shade->isAlive()) + if (Shade && Shade->IsAlive()) { if (CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IsBanished) { @@ -772,14 +772,14 @@ public: if (ShadeGUID) { Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && !Shade->isAlive()) + if (Shade && !Shade->IsAlive()) { ShadeHasDied = true; WayPointId = 0; me->SetWalk(true); me->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[0].x, AkamaWP[0].y, AkamaWP[0].z); } - if (Shade && Shade->isAlive()) + if (Shade && Shade->IsAlive()) { if (Shade->getThreatManager().getThreatList().size() < 2) Shade->AI()->EnterEvadeMode(); @@ -880,14 +880,14 @@ public: if (DestructivePoisonTimer <= diff) { Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && Shade->isAlive()) + if (Shade && Shade->IsAlive()) DoCast(Shade, SPELL_DESTRUCTIVE_POISON); DestructivePoisonTimer = 15000; } else DestructivePoisonTimer -= diff; if (LightningBoltTimer <= diff) { - DoCast(me->getVictim(), SPELL_LIGHTNING_BOLT); + DoCast(me->GetVictim(), SPELL_LIGHTNING_BOLT); LightningBoltTimer = 10000; } else LightningBoltTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 114f83661b3..e1da7882b70 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -109,7 +109,7 @@ public: { if (instance) { - if (me->isAlive()) + if (me->IsAlive()) { instance->SetData(DATA_SUPREMUSEVENT, NOT_STARTED); //ToggleDoors(true); @@ -240,7 +240,7 @@ public: case EVENT_VOLCANO: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); - if (!target) target = me->getVictim(); + if (!target) target = me->GetVictim(); if (target) { //DoCast(target, SPELL_VOLCANIC_SUMMON);//movement bugged diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 1681ecfb00e..0310f9237cd 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -95,7 +95,7 @@ public: DoZoneInCombat(); Creature* Teron = (Unit::GetCreature((*me), TeronGUID)); - if ((Teron) && (!Teron->isAlive() || Teron->IsInEvadeMode())) + if ((Teron) && (!Teron->IsAlive() || Teron->IsInEvadeMode())) Despawn(); } else @@ -104,7 +104,7 @@ public: CheckTeronTimer = 5000; } else CheckTeronTimer -= diff; - if (ShadowBoltTimer < diff && me->isInCombat()) + if (ShadowBoltTimer < diff && me->IsInCombat()) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_SHADOWBOLT); ShadowBoltTimer = 10000; @@ -152,7 +152,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || (!who->isAlive()) || (who->GetGUID() == GhostGUID)) + if (!who || (!who->IsAlive()) || (who->GetGUID() == GhostGUID)) return; ScriptedAI::MoveInLineOfSight(who); @@ -176,7 +176,7 @@ public: for (; itr != threatlist.end(); ++itr) { Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) targets.push_back(unit); } targets.sort(Trinity::ObjectDistanceOrderPred(me)); @@ -199,7 +199,7 @@ public: if (CheckTeronTimer <= diff) { Creature* Teron = (Unit::GetCreature((*me), TeronGUID)); - if (!Teron || !Teron->isAlive() || Teron->IsInEvadeMode()) + if (!Teron || !Teron->IsAlive() || Teron->IsInEvadeMode()) me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); CheckTeronTimer = 5000; @@ -268,7 +268,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!Intro && who->GetTypeId() == TYPEID_PLAYER && me->canCreatureAttack(who)) + if (!Intro && who->GetTypeId() == TYPEID_PLAYER && me->CanCreatureAttack(who)) { if (me->IsWithinDistInMap(who, VISIBLE_RANGE) && me->IsWithinLOSInMap(who)) { @@ -325,7 +325,7 @@ public: for (i = threatlist.begin(); i != threatlist.end(); ++i) { Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) { float threat = DoGetThreat(unit); blossom->AddThreat(unit, threat); @@ -345,7 +345,7 @@ public: Unit* ghost = NULL; if (GhostGUID) ghost = Unit::GetUnit(*me, GhostGUID); - if (ghost && ghost->isAlive() && ghost->HasAura(SPELL_SHADOW_OF_DEATH)) + if (ghost && ghost->IsAlive() && ghost->HasAura(SPELL_SHADOW_OF_DEATH)) { /*float x, y, z; ghost->GetPosition(x, y, z); @@ -369,7 +369,7 @@ public: CAST_AI(mob_shadowy_construct::mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID; Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!target) // someone's trying to solo. - target = me->getVictim(); + target = me->GetVictim(); if (target) Construct->GetMotionMaster()->MoveChase(target); @@ -421,7 +421,7 @@ public: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!target) - target = me->getVictim(); + target = me->GetVictim(); if (target) Shadow->AI()->AttackStart(target); @@ -456,7 +456,7 @@ public: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!target) - target = me->getVictim(); + target = me->GetVictim(); if (target) { @@ -479,9 +479,9 @@ public: Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); if (!target) - target = me->getVictim(); + target = me->GetVictim(); - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + if (target && target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER) { DoCast(target, SPELL_SHADOW_OF_DEATH); GhostGUID = target->GetGUID(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 127ca68ce39..dbd7aa50899 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -169,7 +169,7 @@ public: case EVENT_SPINE: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!target) target = me->getVictim(); + if (!target) target = me->GetVictim(); if (target) { DoCast(target, SPELL_IMPALING_SPINE, true); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 100f23c72af..c6b56566d47 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -254,7 +254,7 @@ public: if (!pMember) continue; - if (!pMember->isAlive()) + if (!pMember->IsAlive()) { pMember->RemoveCorpse(); pMember->Respawn(); @@ -285,7 +285,7 @@ public: if (!instance) return; - if (target && target->isAlive()) + if (target && target->IsAlive()) { Council[0] = instance->GetData64(DATA_GATHIOSTHESHATTERER); Council[1] = instance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); @@ -304,7 +304,7 @@ public: if (Council[i]) { Unit* member = Unit::GetUnit(*me, Council[i]); - if (member && member->isAlive()) + if (member && member->IsAlive()) member->ToCreature()->AI()->AttackStart(target); } } @@ -338,7 +338,7 @@ public: } Creature* pMember = (Unit::GetCreature(*me, Council[DeathCount])); - if (pMember && pMember->isAlive()) + if (pMember && pMember->IsAlive()) pMember->DealDamage(pMember, pMember->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); ++DeathCount; EndEventTimer = 1500; @@ -357,9 +357,9 @@ public: if (Creature* Member = (Unit::GetCreature((*me), Council[i]))) { // This is the evade/death check. - if (Member->isAlive() && !Member->getVictim()) + if (Member->IsAlive() && !Member->GetVictim()) ++EvadeCheck; //If all members evade, we reset so that players can properly reset the event - else if (!Member->isAlive()) // If even one member dies, kill the rest, set instance data, and kill self. + else if (!Member->IsAlive()) // If even one member dies, kill the rest, set instance data, and kill self. { EndEventTimer = 1000; CheckTimer = 0; @@ -425,9 +425,9 @@ struct boss_illidari_councilAI : public ScriptedAI for (uint8 i = 0; i < 4; ++i) { if (Unit* unit = Unit::GetUnit(*me, Council[i])) - if (unit != me && unit->getVictim()) + if (unit != me && unit->GetVictim()) { - AttackStart(unit->getVictim()); + AttackStart(unit->GetVictim()); return; } } @@ -666,14 +666,14 @@ public: if (ArcaneExplosionTimer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION); + DoCast(me->GetVictim(), SPELL_ARCANE_EXPLOSION); Cooldown = 1000; ArcaneExplosionTimer = 14000; } else ArcaneExplosionTimer -= diff; if (ArcaneBoltTimer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_BOLT); + DoCast(me->GetVictim(), SPELL_ARCANE_BOLT); ArcaneBoltTimer = 3000; Cooldown = 2000; } else ArcaneBoltTimer -= diff; @@ -836,13 +836,13 @@ public: { if (DeadlyPoisonTimer <= diff) { - DoCast(me->getVictim(), SPELL_DEADLY_POISON); + DoCast(me->GetVictim(), SPELL_DEADLY_POISON); DeadlyPoisonTimer = urand(15, 46) * 1000; } else DeadlyPoisonTimer -= diff; if (AppearEnvenomTimer <= diff) // Cast Envenom. This is cast 4 seconds after Vanish is over { - DoCast(me->getVictim(), SPELL_ENVENOM); + DoCast(me->GetVictim(), SPELL_ENVENOM); AppearEnvenomTimer = 90000; } else AppearEnvenomTimer -= diff; @@ -868,7 +868,7 @@ public: { if (VanishTimer <= diff) // Become attackable and poison current target { - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); DoCast(target, SPELL_DEADLY_POISON); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoResetThreat(); @@ -882,7 +882,7 @@ public: if (AppearEnvenomTimer <= diff) // Appear 2 seconds before becoming attackable (Shifting out of vanish) { me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); me->SetVisible(true); AppearEnvenomTimer = 6000; } else AppearEnvenomTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 8883b563975..97247f1b7a6 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -134,7 +134,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) return player; } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 0a6c09093f1..8e23bd2a0c9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -147,7 +147,7 @@ public: if (RAdvisors[i]) { pAdvisor = (Unit::GetCreature((*me), RAdvisors[i])); - if (pAdvisor && !pAdvisor->isAlive()) + if (pAdvisor && !pAdvisor->IsAlive()) { pAdvisor->Respawn(); pAdvisor->AI()->EnterEvadeMode(); @@ -225,7 +225,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER))) { @@ -253,7 +253,7 @@ public: //if there aren't other units, cast on the tank if (!target) - target = me->getVictim(); + target = me->GetVictim(); if (target) DoCast(target, SPELL_CATACLYSMIC_BOLT); @@ -263,7 +263,7 @@ public: //SearNova_Timer if (SearNova_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SEAR_NOVA); + DoCast(me->GetVictim(), SPELL_SEAR_NOVA); SearNova_Timer = 20000+rand()%40000; } else SearNova_Timer -= diff; @@ -284,7 +284,7 @@ public: if (Advisors[i]) { Advisor = (Unit::GetCreature(*me, Advisors[i])); - if (Advisor && Advisor->isAlive()) + if (Advisor && Advisor->IsAlive()) { continueTriggering = true; break; @@ -343,7 +343,7 @@ public: pet = false; Creature* Pet = Unit::GetCreature(*me, SummonedPet); - if (Pet && Pet->isAlive()) + if (Pet && Pet->IsAlive()) { Pet->DealDamage(Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -375,7 +375,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER))) AttackStart(target); @@ -395,14 +395,14 @@ public: //LeechingThrow_Timer if (LeechingThrow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_LEECHING_THROW); + DoCast(me->GetVictim(), SPELL_LEECHING_THROW); LeechingThrow_Timer = 20000; } else LeechingThrow_Timer -= diff; //Multishot_Timer if (Multishot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MULTISHOT); + DoCast(me->GetVictim(), SPELL_MULTISHOT); Multishot_Timer = 20000; } else Multishot_Timer -= diff; @@ -411,7 +411,7 @@ public: { DoCast(me, SPELL_THE_BEAST_WITHIN); Creature* Pet = Unit::GetCreature(*me, SummonedPet); - if (Pet && Pet->isAlive()) + if (Pet && Pet->IsAlive()) { Pet->CastSpell(Pet, SPELL_PET_ENRAGE, true); } @@ -509,7 +509,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER))) AttackStart(target); @@ -534,7 +534,7 @@ public: //FrostShock_Timer if (FrostShock_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROST_SHOCK); + DoCast(me->GetVictim(), SPELL_FROST_SHOCK); FrostShock_Timer = 25000+rand()%5000; } else FrostShock_Timer -= diff; @@ -543,7 +543,7 @@ public: { DoCast(me, SPELL_SPITFIRE_TOTEM); if (Unit* SpitfireTotem = Unit::GetUnit(*me, CREATURE_SPITFIRE_TOTEM)) - SpitfireTotem->ToCreature()->AI()->AttackStart(me->getVictim()); + SpitfireTotem->ToCreature()->AI()->AttackStart(me->GetVictim()); Spitfire_Timer = 60000; } @@ -631,7 +631,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER))) AttackStart(target); @@ -651,16 +651,16 @@ public: //WaterBoltVolley_Timer if (WaterBoltVolley_Timer <= diff) { - DoCast(me->getVictim(), SPELL_WATER_BOLT_VOLLEY); + DoCast(me->GetVictim(), SPELL_WATER_BOLT_VOLLEY); WaterBoltVolley_Timer = 30000; } else WaterBoltVolley_Timer -= diff; //TidalSurge_Timer if (TidalSurge_Timer <= diff) { - DoCast(me->getVictim(), SPELL_TIDAL_SURGE); + DoCast(me->GetVictim(), SPELL_TIDAL_SURGE); // Hacky way to do it - won't trigger elseways - me->getVictim()->CastSpell(me->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true); + me->GetVictim()->CastSpell(me->GetVictim(), SPELL_TIDAL_SURGE_FREEZE, true); TidalSurge_Timer = 15000+rand()%5000; } else TidalSurge_Timer -= diff; @@ -689,10 +689,10 @@ public: // It can be cast on any of the mobs Unit* unit = NULL; - while (unit == NULL || !unit->isAlive()) + while (unit == NULL || !unit->IsAlive()) unit = selectAdvisorUnit(); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) DoCast(unit, SPELL_HEAL); Heal_Timer = 60000; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 2f0d736d8ef..7e203dfeed9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -260,7 +260,7 @@ public: break; } - DoCast(me->getVictim(), mark_spell); + DoCast(me->GetVictim(), mark_spell); if (MarkOfCorruption_Count < 5) ++MarkOfCorruption_Count; @@ -343,7 +343,7 @@ public: break; } - DoCast(me->getVictim(), mark_spell); + DoCast(me->GetVictim(), mark_spell); if (MarkOfHydross_Count < 5) ++MarkOfHydross_Count; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index ae63ed67af1..5ee43b9b0fb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -254,7 +254,7 @@ public: Map* map = me->GetMap(); Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->DestroyItemCount(31088, 1, true); } StartEvent(); // this is EnterCombat(), so were are 100% in combat, start the event @@ -272,15 +272,15 @@ public: } if (!CanAttack) return; - if (!who || me->getVictim()) + if (!who || me->GetVictim()) return; - if (me->canCreatureAttack(who)) + if (me->CanCreatureAttack(who)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && me->IsWithinLOSInMap(who)) { - if (!me->isInCombat()) // AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking + if (!me->IsInCombat()) // AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking StartEvent(); if (Phase != 2) @@ -296,12 +296,12 @@ public: case 0: // Shoot // Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her target for 4097-5543 Physical damage. - DoCast(me->getVictim(), SPELL_SHOOT); + DoCast(me->GetVictim(), SPELL_SHOOT); break; case 1: // Multishot // Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits 1 person and 4 people around him for 6475-7525 physical damage. - DoCast(me->getVictim(), SPELL_MULTI_SHOT); + DoCast(me->GetVictim(), SPELL_MULTI_SHOT); break; } if (rand()%3) @@ -327,7 +327,7 @@ public: } } // to prevent abuses during phase 2 - if (Phase == 2 && !me->getVictim() && me->isInCombat()) + if (Phase == 2 && !me->GetVictim() && me->IsInCombat()) { EnterEvadeMode(); return; @@ -343,8 +343,8 @@ public: { // Shock Burst // Randomly used in Phases 1 and 3 on Vashj's target, it's a Shock spell doing 8325-9675 nature damage and stunning the target for 5 seconds, during which she will not attack her target but switch to the next person on the aggro list. - DoCast(me->getVictim(), SPELL_SHOCK_BLAST); - me->TauntApply(me->getVictim()); + DoCast(me->GetVictim(), SPELL_SHOCK_BLAST); + me->TauntApply(me->GetVictim()); ShockBlastTimer = 1000+rand()%14000; // random cooldown } else ShockBlastTimer -= diff; @@ -368,7 +368,7 @@ public: { // Entangle // Used in Phases 1 and 3, it casts Entangling Roots on everybody in a 15 yard radius of Vashj, immobilzing them for 10 seconds and dealing 500 damage every 2 seconds. It's not a magic effect so it cannot be dispelled, but is removed by various buffs such as Cloak of Shadows or Blessing of Freedom. - DoCast(me->getVictim(), SPELL_ENTANGLE); + DoCast(me->GetVictim(), SPELL_ENTANGLE); Entangle = true; EntangleTimer = 10000; } @@ -457,7 +457,7 @@ public: Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!target) - target = me->getVictim(); + target = me->GetVictim(); DoCast(target, SPELL_FORKED_LIGHTNING); @@ -495,8 +495,8 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) coilfangElite->AI()->AttackStart(target); - else if (me->getVictim()) - coilfangElite->AI()->AttackStart(me->getVictim()); + else if (me->GetVictim()) + coilfangElite->AI()->AttackStart(me->GetVictim()); } CoilfangEliteTimer = 45000+rand()%5000; } else CoilfangEliteTimer -= diff; @@ -509,8 +509,8 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) CoilfangStrider->AI()->AttackStart(target); - else if (me->getVictim()) - CoilfangStrider->AI()->AttackStart(me->getVictim()); + else if (me->GetVictim()) + CoilfangStrider->AI()->AttackStart(me->GetVictim()); } CoilfangStriderTimer = 60000+rand()%10000; } else CoilfangStriderTimer -= diff; @@ -531,7 +531,7 @@ public: Phase = 3; // return to the tank - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } CheckTimer = 1000; } else CheckTimer -= diff; @@ -626,7 +626,7 @@ public: DoCast(me, SPELL_SURGE); } if (Creature* vashj = Unit::GetCreature(*me, VashjGUID)) - if (!vashj->isInCombat() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->Phase != 2 || vashj->isDead()) + if (!vashj->IsInCombat() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->Phase != 2 || vashj->isDead()) me->Kill(me); Move = 1000; } else Move -= diff; @@ -786,7 +786,7 @@ public: { // check if vashj is death Unit* Vashj = Unit::GetUnit(*me, instance->GetData64(DATA_LADYVASHJ)); - if (!Vashj || !Vashj->isAlive() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->ToCreature()->AI())->Phase != 3) + if (!Vashj || !Vashj->IsAlive() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->ToCreature()->AI())->Phase != 3) { // remove me->setDeathState(DEAD); @@ -845,7 +845,7 @@ public: { Unit* vashj = Unit::GetUnit(*me, instance->GetData64(DATA_LADYVASHJ)); - if (vashj && vashj->isAlive()) + if (vashj && vashj->IsAlive()) { // start visual channel if (!Casted || !vashj->HasAura(SPELL_MAGIC_BARRIER)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index f4e0c6cee2a..d0b0166b918 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -138,11 +138,11 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetGUID() != victimGUID) + if (me->GetVictim()->GetGUID() != victimGUID) { - DoModifyThreatPercent(me->getVictim(), -100); + DoModifyThreatPercent(me->GetVictim(), -100); Unit* owner = Unit::GetUnit(*me, victimGUID); - if (owner && owner->isAlive()) + if (owner && owner->IsAlive()) { me->AddThreat(owner, 999999); AttackStart(owner); @@ -155,7 +155,7 @@ public: if (Link_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SOUL_LINK, true); + DoCast(me->GetVictim(), SPELL_SOUL_LINK, true); Link_Timer = 1000; } else Link_Timer -= diff; @@ -164,7 +164,7 @@ public: if (ShadowBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOWBOLT, false); + DoCast(me->GetVictim(), SPELL_SHADOWBOLT, false); ShadowBolt_Timer = 10000; } else ShadowBolt_Timer -= diff; @@ -269,7 +269,7 @@ public: if (me->HasAura(AURA_BANISH)) return; - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { if (me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -299,7 +299,7 @@ public: for (uint8 i = 0; i < 3; ++i) { Unit* add = Unit::GetUnit(*me, SpellBinderGUID[i]); - if (add && add->isAlive()) + if (add && add->IsAlive()) ++AliveChannelers; } @@ -352,7 +352,7 @@ public: { //delete creature Creature* creature = Unit::GetCreature((*me), InnderDemon[i]); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) { creature->DespawnOrUnsummon(); } @@ -370,10 +370,10 @@ public: if (InnderDemon[i] > 0) { Creature* unit = Unit::GetCreature((*me), InnderDemon[i]); - if (unit && unit->isAlive()) + if (unit && unit->IsAlive()) { Unit* unit_target = Unit::GetUnit(*unit, unit->AI()->GetGUID(INNER_DEMON_VICTIM)); - if (unit_target && unit_target->isAlive()) + if (unit_target && unit_target->IsAlive()) { unit->CastSpell(unit_target, SPELL_CONSUMING_MADNESS, true); DoModifyThreatPercent(unit_target, -100); @@ -452,7 +452,7 @@ public: NeedThreatReset = false; DoResetThreat(); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } //Enrage_Timer (10 min) @@ -498,18 +498,18 @@ public: else { //ChaosBlast_Timer - if (!me->getVictim()) + if (!me->GetVictim()) return; - if (me->IsWithinDist(me->getVictim(), 30)) + if (me->IsWithinDist(me->GetVictim(), 30)) me->StopMoving(); if (ChaosBlast_Timer <= diff) { // will cast only when in range of spell - if (me->IsWithinDist(me->getVictim(), 30)) + if (me->IsWithinDist(me->GetVictim(), 30)) { - //DoCast(me->getVictim(), SPELL_CHAOS_BLAST, true); + //DoCast(me->GetVictim(), SPELL_CHAOS_BLAST, true); int damage = 100; - me->CastCustomSpell(me->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); + me->CastCustomSpell(me->GetVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); } ChaosBlast_Timer = 3000; } else ChaosBlast_Timer -= diff; @@ -521,13 +521,13 @@ public: for (ThreatContainer::StorageType::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { Unit* tempTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5) + if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->GetVictim()->GetGUID() && TargetList.size()<5) TargetList.push_back(tempTarget); } //SpellInfo* spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); for (std::vector<Unit*>::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { - if ((*itr) && (*itr)->isAlive()) + if ((*itr) && (*itr)->IsAlive()) { Creature* demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (demon) @@ -580,8 +580,8 @@ public: if (Copy) { Demon = Copy->GetGUID(); - if (me->getVictim()) - Copy->AI()->AttackStart(me->getVictim()); + if (me->GetVictim()) + Copy->AI()->AttackStart(me->GetVictim()); } //set nightelf final form IsFinalForm = true; @@ -649,17 +649,17 @@ public: if (!UpdateVictim()) return; //ChaosBlast_Timer - if (me->IsWithinDist(me->getVictim(), 30)) + if (me->IsWithinDist(me->GetVictim(), 30)) me->StopMoving(); if (ChaosBlast_Timer <= diff) { // will cast only when in range od spell - if (me->IsWithinDist(me->getVictim(), 30)) + if (me->IsWithinDist(me->GetVictim(), 30)) { - //DoCast(me->getVictim(), SPELL_CHAOS_BLAST, true); + //DoCast(me->GetVictim(), SPELL_CHAOS_BLAST, true); int damage = 100; - me->CastCustomSpell(me->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); + me->CastCustomSpell(me->GetVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); ChaosBlast_Timer = 3000; } } else ChaosBlast_Timer -= diff; @@ -706,7 +706,7 @@ public: { instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0); Creature* leotheras = Unit::GetCreature(*me, leotherasGUID); - if (leotheras && leotheras->isAlive()) + if (leotheras && leotheras->IsAlive()) CAST_AI(boss_leotheras_the_blind::boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); } } @@ -726,12 +726,12 @@ public: void CastChanneling() { - if (!me->isInCombat() && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) + if (!me->IsInCombat() && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) { if (leotherasGUID) { Creature* leotheras = Unit::GetCreature(*me, leotherasGUID); - if (leotheras && leotheras->isAlive()) + if (leotheras && leotheras->IsAlive()) DoCast(leotheras, BANISH_BEAM); } } @@ -744,7 +744,7 @@ public: if (!leotherasGUID) leotherasGUID = instance->GetData64(DATA_LEOTHERAS); - if (!me->isInCombat() && instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + if (!me->IsInCombat() && instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { Unit* victim = NULL; victim = Unit::GetUnit(*me, instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); @@ -781,7 +781,7 @@ public: Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { - if (Player* i_pl = itr->getSource()) + if (Player* i_pl = itr->GetSource()) { bool isCasting = false; for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 18324822c4a..8ca61395f3a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -163,7 +163,7 @@ public: { if (!CanStartEvent) // boss is invisible, don't attack return; - if (!me->getVictim() && who->IsValidAttackTarget(me)) + if (!me->GetVictim() && who->IsValidAttackTarget(me)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius)) @@ -216,7 +216,7 @@ public: if (me->getThreatManager().getThreatList().empty()) // check if should evade { - if (me->isInCombat()) + if (me->IsInCombat()) EnterEvadeMode(); return; } @@ -257,7 +257,7 @@ public: { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (me->IsWithinMeleeRange(i->getSource())) + if (me->IsWithinMeleeRange(i->GetSource())) InRange = true; } } @@ -272,8 +272,8 @@ public: Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) - DoCast(i->getSource(), SPELL_SPOUT, true); // only knock back players in arc, in 100yards, not in water + if (i->GetSource() && i->GetSource()->IsAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->GetSource()) && me->IsWithinDist(i->GetSource(), SPOUT_DIST) && !i->GetSource()->IsInWater()) + DoCast(i->GetSource(), SPELL_SPOUT, true); // only knock back players in arc, in 100yards, not in water } } @@ -293,8 +293,8 @@ public: if (GeyserTimer <= diff) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!target && me->getVictim()) - target = me->getVictim(); + if (!target && me->GetVictim()) + target = me->GetVictim(); if (target) DoCast(target, SPELL_GEYSER, true); GeyserTimer = rand()%5000 + 15000; @@ -305,8 +305,8 @@ public: if (WaterboltTimer <= diff) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!target && me->getVictim()) - target = me->getVictim(); + if (!target && me->GetVictim()) + target = me->GetVictim(); if (target) DoCast(target, SPELL_WATERBOLT, true); WaterboltTimer = 3000; @@ -341,7 +341,7 @@ public: return; } - if (!me->isInCombat()) + if (!me->IsInCombat()) DoZoneInCombat(); if (!Spawned) @@ -386,7 +386,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || me->getVictim()) + if (!who || me->GetVictim()) return; if (who->isInAccessiblePlaceFor(me) && me->IsValidAttackTarget(who) && me->IsWithinDistInMap(who, 45)) @@ -397,8 +397,8 @@ public: { if (MultiShotTimer <= diff) { - if (me->getVictim()) - DoCast(me->getVictim(), SPELL_SPREAD_SHOT, true); + if (me->GetVictim()) + DoCast(me->GetVictim(), SPELL_SPREAD_SHOT, true); MultiShotTimer = 10000+rand()%10000; ShootBowTimer += 1500; // add global cooldown diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 592746742f5..9202bdb653b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -174,7 +174,7 @@ public: { if (!Earthquake) { - DoCast(me->getVictim(), SPELL_EARTHQUAKE); + DoCast(me->GetVictim(), SPELL_EARTHQUAKE); Earthquake = true; Earthquake_Timer = 10000; } @@ -197,7 +197,7 @@ public: //TidalWave_Timer if (TidalWave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_TIDAL_WAVE); + DoCast(me->GetVictim(), SPELL_TIDAL_WAVE); TidalWave_Timer = 20000; } else TidalWave_Timer -= diff; @@ -309,10 +309,10 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || me->getVictim()) + if (!who || me->GetVictim()) return; - if (me->canCreatureAttack(who)) + if (me->CanCreatureAttack(who)) { //no attack radius check - it attacks the first target that moves in his los //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); @@ -328,9 +328,9 @@ public: if (Check_Timer <= diff) { - if (me->IsWithinDistInMap(me->getVictim(), 5)) + if (me->IsWithinDistInMap(me->GetVictim(), 5)) { - DoCast(me->getVictim(), SPELL_GLOBULE_EXPLOSION); + DoCast(me->GetVictim(), SPELL_GLOBULE_EXPLOSION); //despawn me->DespawnOrUnsummon(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 207d388f41f..439edefae8c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -137,9 +137,9 @@ class instance_serpent_shrine : public InstanceMapScript return; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isAlive() && /*i->getSource()->GetPositionZ() <= -21.434931f*/player->IsInWater()) + if (player->IsAlive() && /*i->GetSource()->GetPositionZ() <= -21.434931f*/player->IsInWater()) { if (Water == WATERSTATE_SCALDING) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 12e4e3a496f..3d64d258e0a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -129,7 +129,7 @@ public: if (Shrink_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SUPER_SHRINK_RAY); + DoCast(me->GetVictim(), SPELL_SUPER_SHRINK_RAY); Shrink_Timer = 20000; } else Shrink_Timer -= diff; @@ -138,14 +138,14 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(target, SPELL_SAW_BLADE); else - DoCast(me->getVictim(), SPELL_SAW_BLADE); + DoCast(me->GetVictim(), SPELL_SAW_BLADE); Saw_Blade_Timer = 15000; } else Saw_Blade_Timer -= diff; if (Electrified_Net_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ELECTRIFIED_NET); + DoCast(me->GetVictim(), SPELL_ELECTRIFIED_NET); Electrified_Net_Timer = 10000; } else Electrified_Net_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 22f406c6c5b..e5d0726dca4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -90,8 +90,8 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) summon->AI()->AttackStart(target); else - if (me->getVictim()) - summon->AI()->AttackStart(me->getVictim()); + if (me->GetVictim()) + summon->AI()->AttackStart(me->GetVictim()); } } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 6c3e21aa5c0..6b7190e3853 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -151,8 +151,8 @@ public: //and correct movement, if not already if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE) { - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); } } } @@ -197,10 +197,10 @@ public: { Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - if (target && me->IsWithinMeleeRange(me->getVictim())) + if (target && me->IsWithinMeleeRange(me->GetVictim())) DoCast(target, SPELL_HURTFUL_STRIKE); else - DoCast(me->getVictim(), SPELL_HURTFUL_STRIKE); + DoCast(me->GetVictim(), SPELL_HURTFUL_STRIKE); m_uiHurtfulStrike_Timer= 8000; } @@ -210,7 +210,7 @@ public: // Reverberation if (m_uiReverberation_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_REVERBERATION, true); + DoCast(me->GetVictim(), SPELL_REVERBERATION, true); m_uiReverberation_Timer = urand(15000, 25000); } else diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 3018c18383e..6812a77d01c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -98,7 +98,7 @@ bool CheckAllBossDied(InstanceScript* instance, Creature* me) if (!Maulgar || !Kiggler || !Blindeye || !Olm || !Krosh) return false; - if (!Maulgar->isAlive() && !Kiggler->isAlive() && !Blindeye->isAlive() && !Olm->isAlive() && !Krosh->isAlive()) + if (!Maulgar->IsAlive() && !Kiggler->IsAlive() && !Blindeye->IsAlive() && !Olm->IsAlive() && !Krosh->IsAlive()) return true; return false; @@ -154,7 +154,7 @@ public: if (Council[i]) { creature = (Unit::GetCreature((*me), Council[i])); - if (creature && !creature->isAlive()) + if (creature && !creature->IsAlive()) { creature->Respawn(); creature->AI()->EnterEvadeMode(); @@ -220,7 +220,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -245,21 +245,21 @@ public: //ArcingSmash_Timer if (ArcingSmash_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCING_SMASH); + DoCast(me->GetVictim(), SPELL_ARCING_SMASH); ArcingSmash_Timer = 10000; } else ArcingSmash_Timer -= diff; //Whirlwind_Timer if (Whirlwind_Timer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 55000; } else Whirlwind_Timer -= diff; //MightyBlow_Timer if (MightyBlow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MIGHTY_BLOW); + DoCast(me->GetVictim(), SPELL_MIGHTY_BLOW); MightyBlow_Timer = 30000+rand()%10000; } else MightyBlow_Timer -= diff; @@ -380,7 +380,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -404,7 +404,7 @@ public: //DarkDecay_Timer if (DarkDecay_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DARK_DECAY); + DoCast(me->GetVictim(), SPELL_DARK_DECAY); DarkDecay_Timer = 20000; } else DarkDecay_Timer -= diff; @@ -495,7 +495,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -528,21 +528,21 @@ public: //LightningBolt_Timer if (LightningBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_LIGHTNING_BOLT); + DoCast(me->GetVictim(), SPELL_LIGHTNING_BOLT); LightningBolt_Timer = 15000; } else LightningBolt_Timer -= diff; //ArcaneShock_Timer if (ArcaneShock_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_SHOCK); + DoCast(me->GetVictim(), SPELL_ARCANE_SHOCK); ArcaneShock_Timer = 20000; } else ArcaneShock_Timer -= diff; //ArcaneExplosion_Timer if (ArcaneExplosion_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION); + DoCast(me->GetVictim(), SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 30000; } else ArcaneExplosion_Timer -= diff; @@ -614,7 +614,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -724,7 +724,7 @@ public: void UpdateAI(uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) + if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -746,9 +746,9 @@ public: } //GreaterFireball_Timer - if (GreaterFireball_Timer < diff || me->IsWithinDist(me->getVictim(), 30)) + if (GreaterFireball_Timer < diff || me->IsWithinDist(me->GetVictim(), 30)) { - DoCast(me->getVictim(), SPELL_GREATER_FIREBALL); + DoCast(me->GetVictim(), SPELL_GREATER_FIREBALL); GreaterFireball_Timer = 2000; } else GreaterFireball_Timer -= diff; @@ -756,7 +756,7 @@ public: if (SpellShield_Timer <= diff) { me->InterruptNonMeleeSpells(false); - DoCast(me->getVictim(), SPELL_SPELLSHIELD); + DoCast(me->GetVictim(), SPELL_SPELLSHIELD); SpellShield_Timer = 30000; } else SpellShield_Timer -= diff; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 0e584686f9b..c9a3c09d3fb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -92,7 +92,7 @@ class boss_broggok : public CreatureScript return; if (AcidSpray_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SLIME_SPRAY); + DoCast(me->GetVictim(), SPELL_SLIME_SPRAY); AcidSpray_Timer = 4000+rand()%8000; } else @@ -100,7 +100,7 @@ class boss_broggok : public CreatureScript if (PoisonBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_POISON_BOLT); + DoCast(me->GetVictim(), SPELL_POISON_BOLT); PoisonBolt_Timer = 4000+rand()%8000; } else diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index d2096140ff4..2d663465660 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -140,7 +140,7 @@ class boss_kelidan_the_breaker : public CreatureScript for (uint8 i=0; i<5; ++i) { Creature* channeler = Unit::GetCreature(*me, Channelers[i]); - if (who && channeler && !channeler->isInCombat()) + if (who && channeler && !channeler->IsInCombat()) channeler->AI()->AttackStart(who); } } @@ -150,7 +150,7 @@ class boss_kelidan_the_breaker : public CreatureScript for (uint8 i=0; i<5; ++i) { Creature* channeler = Unit::GetCreature(*me, Channelers[i]); - if (channeler && channeler->isAlive()) + if (channeler && channeler->IsAlive()) return; } me->SetReactState(REACT_AGGRESSIVE); @@ -361,7 +361,7 @@ class mob_shadowmoon_channeler : public CreatureScript if (ShadowBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT); ShadowBolt_Timer = 5000+rand()%1000; } else diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 8014ee9f8e0..7a755b40ba7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -112,7 +112,7 @@ class boss_the_maker : public CreatureScript if (AcidSpray_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ACID_SPRAY); + DoCast(me->GetVictim(), SPELL_ACID_SPRAY); AcidSpray_Timer = 15000+rand()%8000; } else @@ -141,7 +141,7 @@ class boss_the_maker : public CreatureScript if (Knockdown_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKDOWN); + DoCast(me->GetVictim(), SPELL_KNOCKDOWN); Knockdown_Timer = 4000+rand()%8000; } else diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index be51b7922a2..65ae859b5ae 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -313,7 +313,7 @@ class instance_blood_furnace : public InstanceMapScript void ResetPrisoner(Creature* prisoner) { - if (!prisoner->isAlive()) + if (!prisoner->IsAlive()) prisoner->Respawn(true); prisoner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 0c5325f7172..872b05d8ed1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -160,8 +160,8 @@ class boss_omor_the_unscarred : public CreatureScript if (OrbitalStrike_Timer <= diff) { Unit* temp = NULL; - if (me->IsWithinMeleeRange(me->getVictim())) - temp = me->getVictim(); + if (me->IsWithinMeleeRange(me->GetVictim())) + temp = me->GetVictim(); else temp = SelectTarget(SELECT_TARGET_RANDOM, 0); if (temp && temp->GetTypeId() == TYPEID_PLAYER) @@ -206,7 +206,7 @@ class boss_omor_the_unscarred : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (target) - target = me->getVictim(); + target = me->GetVictim(); DoCast(target, SPELL_SHADOW_BOLT); Shadowbolt_Timer = 4000+rand()%2500; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index e820e22d65a..033d8e4c85e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -141,7 +141,7 @@ class boss_nazan : public CreatureScript if (flight) // phase 1 - the flight { Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID); - if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20))) + if (Fly_Timer < diff || !(Vazruden && Vazruden->IsAlive() && Vazruden->HealthAbovePct(20))) { flight = false; BellowingRoar_Timer = 6000; @@ -151,7 +151,7 @@ class boss_nazan : public CreatureScript me->GetMotionMaster()->Clear(); if (Unit* victim = SelectTarget(SELECT_TARGET_NEAREST, 0)) me->AI()->AttackStart(victim); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); Talk(EMOTE); return; } @@ -247,7 +247,7 @@ class boss_vazruden : public CreatureScript { if (!UpdateVictim()) { - if (UnsummonCheck < diff && me->isAlive()) + if (UnsummonCheck < diff && me->IsAlive()) { if (!WipeSaid) { @@ -263,7 +263,7 @@ class boss_vazruden : public CreatureScript if (Revenge_Timer <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) DoCast(victim, DUNGEON_MODE(SPELL_REVENGE, SPELL_REVENGE_H)); Revenge_Timer = 5000; } @@ -371,7 +371,7 @@ class boss_vazruden_the_herald : public CreatureScript { if (!summoned) return; - Unit* victim = me->getVictim(); + Unit* victim = me->GetVictim(); if (summoned->GetEntry() == ENTRY_NAZAN) { CAST_AI(boss_nazan::boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID; @@ -427,9 +427,9 @@ class boss_vazruden_the_herald : public CreatureScript { Creature* Nazan = Unit::GetCreature(*me, NazanGUID); Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID); - if ((Nazan && Nazan->isAlive()) || (Vazruden && Vazruden->isAlive())) + if ((Nazan && Nazan->IsAlive()) || (Vazruden && Vazruden->IsAlive())) { - if ((Nazan && Nazan->getVictim()) || (Vazruden && Vazruden->getVictim())) + if ((Nazan && Nazan->GetVictim()) || (Vazruden && Vazruden->GetVictim())) return; else { @@ -494,7 +494,7 @@ class mob_hellfire_sentry : public CreatureScript if (KidneyShot_Timer <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) DoCast(victim, SPELL_KIDNEY_SHOT); KidneyShot_Timer = 20000; } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 8961c94ab31..cf5becb56ce 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -83,7 +83,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript void MoveInLineOfSight(Unit* who) { - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -119,7 +119,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript if (MortalWound_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); MortalWound_Timer = 5000+rand()%8000; } else diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 777f24f779b..ca0c60aafde 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -178,7 +178,7 @@ class mob_abyssal : public CreatureScript if (FireBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIRE_BLAST); + DoCast(me->GetVictim(), SPELL_FIRE_BLAST); FireBlast_Timer = 5000+rand()%10000; } else FireBlast_Timer -= diff; @@ -267,7 +267,7 @@ class boss_magtheridon : public CreatureScript //function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT) void DebuffClicker(Unit* clicker) { - if (!clicker || !clicker->isAlive()) + if (!clicker || !clicker->IsAlive()) return; clicker->RemoveAurasDueToSpell(SPELL_SHADOW_GRASP); // cannot interrupt triggered spells @@ -341,7 +341,7 @@ class boss_magtheridon : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) { if (RandChat_Timer <= diff) { @@ -368,7 +368,7 @@ class boss_magtheridon : public CreatureScript if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; } else @@ -513,7 +513,7 @@ class mob_hellfire_channeler : public CreatureScript void JustSummoned(Creature* summon) { - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); } void DamageTaken(Unit*, uint32 &damage) @@ -596,7 +596,7 @@ public: if (instance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; Creature* Magtheridon =Unit::GetCreature(*go, instance->GetData64(DATA_MAGTHERIDON)); - if (!Magtheridon || !Magtheridon->isAlive()) + if (!Magtheridon || !Magtheridon->IsAlive()) return true; // if exhausted or already channeling return diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 3d34d1fd6ae..6d65e8ebc43 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -155,7 +155,7 @@ class instance_magtheridons_lair : public InstanceMapScript { if (Creature* Channeler = instance->GetCreature(*i)) { - if (Channeler->isAlive()) + if (Channeler->IsAlive()) Channeler->AI()->EnterEvadeMode(); else Channeler->Respawn(); @@ -173,12 +173,12 @@ class instance_magtheridons_lair : public InstanceMapScript for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) { Creature* Channeler = instance->GetCreature(*i); - if (Channeler && Channeler->isAlive()) + if (Channeler && Channeler->IsAlive()) Channeler->AI()->AttackStart(Channeler->SelectNearestTarget(999)); } // Release Magtheridon after two minutes. Creature* Magtheridon = instance->GetCreature(MagtheridonGUID); - if (Magtheridon && Magtheridon->isAlive()) + if (Magtheridon && Magtheridon->IsAlive()) { Magtheridon->MonsterTextEmote(EMOTE_BONDS_WEAKEN, 0); CageTimer = 120000; @@ -190,7 +190,7 @@ class instance_magtheridons_lair : public InstanceMapScript for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) { Creature* Channeler = instance->GetCreature(*i); - if (Channeler && Channeler->isAlive()) + if (Channeler && Channeler->IsAlive()) { //Channeler->CastSpell(Channeler, SPELL_SOUL_TRANSFER, true); data = IN_PROGRESS; @@ -225,7 +225,7 @@ class instance_magtheridons_lair : public InstanceMapScript if (CageTimer <= diff) { Creature* Magtheridon = instance->GetCreature(MagtheridonGUID); - if (Magtheridon && Magtheridon->isAlive()) + if (Magtheridon && Magtheridon->IsAlive()) { Magtheridon->ClearUnitState(UNIT_STATE_STUNNED); Magtheridon->AI()->AttackStart(Magtheridon->SelectNearestTarget(999)); @@ -242,7 +242,7 @@ class instance_magtheridons_lair : public InstanceMapScript { if (Creature* Channeler = instance->GetCreature(*i)) { - if (Channeler->isAlive()) + if (Channeler->IsAlive()) Channeler->AI()->EnterEvadeMode(); else Channeler->Respawn(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 4095f3295fa..ed414215bef 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -239,13 +239,13 @@ class boss_grand_warlock_nethekurse : public CreatureScript { if (!SpinOnce) { - DoCast(me->getVictim(), SPELL_DARK_SPIN); + DoCast(me->GetVictim(), SPELL_DARK_SPIN); SpinOnce = true; } if (Cleave_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_CLEAVE); + DoCast(me->GetVictim(), SPELL_SHADOW_CLEAVE); Cleave_Timer = 6000+rand()%2500; } else @@ -353,7 +353,7 @@ class mob_fel_orc_convert : public CreatureScript if (Hemorrhage_Timer <= diff) { - DoCast(me->getVictim(), SPELL_HEMORRHAGE); + DoCast(me->GetVictim(), SPELL_HEMORRHAGE); Hemorrhage_Timer = 15000; } else Hemorrhage_Timer -= diff; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index a13d91e8bff..c8fa8948e5a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -165,7 +165,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript for (std::vector<uint64>::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr) { Creature* creature = Unit::GetCreature(*me, *itr); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) { creature->GetMotionMaster()->Clear(true); me->DealDamage(creature, creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -177,7 +177,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript for (std::vector<uint64>::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) { Creature* creature = Unit::GetCreature(*me, *itr); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) { creature->GetMotionMaster()->Clear(true); me->DealDamage(creature, creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -222,7 +222,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript // stop bladedance InBlade = false; me->SetSpeed(MOVE_RUN, 2); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); Blade_Dance_Timer = 30000; Wait_Timer = 0; if (IsHeroic()) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 099bd6949cb..530e811f8cd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -214,7 +214,7 @@ class boss_alar : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) // sometimes isincombat but !incombat, faction bug? + if (!me->IsInCombat()) // sometimes IsInCombat but !incombat, faction bug? return; if (Berserk_Timer <= diff) @@ -383,7 +383,7 @@ class boss_alar : public CreatureScript if (MeltArmor_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MELT_ARMOR); + DoCast(me->GetVictim(), SPELL_MELT_ARMOR); MeltArmor_Timer = 60000; } else @@ -431,9 +431,9 @@ class boss_alar : public CreatureScript { if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false)) { - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - me->AttackerStateUpdate(me->getVictim()); + me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index b8245729d73..88fb5ca6c74 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -240,7 +240,7 @@ class boss_high_astromancer_solarian : public CreatureScript { if (BlindingLight) { - DoCast(me->getVictim(), SPELL_BLINDING_LIGHT); + DoCast(me->GetVictim(), SPELL_BLINDING_LIGHT); BlindingLight = false; } else @@ -248,7 +248,7 @@ class boss_high_astromancer_solarian : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (!me->HasInArc(2.5f, target)) - target = me->getVictim(); + target = me->GetVictim(); DoCast(target, SPELL_ARCANE_MISSILES); } @@ -381,7 +381,7 @@ class boss_high_astromancer_solarian : public CreatureScript //VoidBolt_Timer if (VoidBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_VOID_BOLT); + DoCast(me->GetVictim(), SPELL_VOID_BOLT); VoidBolt_Timer = 10000; } else @@ -473,7 +473,7 @@ class mob_solarium_priest : public CreatureScript if (holysmiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_SOLARIUM_HOLY_SMITE); + DoCast(me->GetVictim(), SPELL_SOLARIUM_HOLY_SMITE); holysmiteTimer = 4000; } else @@ -481,7 +481,7 @@ class mob_solarium_priest : public CreatureScript if (aoesilenceTimer <= diff) { - DoCast(me->getVictim(), SPELL_SOLARIUM_ARCANE_TORRENT); + DoCast(me->GetVictim(), SPELL_SOLARIUM_ARCANE_TORRENT); aoesilenceTimer = 13000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index e30f153b39f..f995a454671 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -252,7 +252,7 @@ struct advisorbase_ai : public ScriptedAI Unit* Target = Unit::GetUnit(*me, DelayRes_Target); if (!Target) - Target = me->getVictim(); + Target = me->GetVictim(); DoResetThreat(); AttackStart(Target); @@ -324,7 +324,7 @@ class boss_kaelthas : public CreatureScript IsCastingFireball = false; ChainPyros = false; - if (me->isInCombat()) + if (me->IsInCombat()) PrepareAdvisors(); summons.DespawnAll(); @@ -393,7 +393,7 @@ class boss_kaelthas : public CreatureScript void MoveInLineOfSight(Unit* who) { - if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->canCreatureAttack(who)) + if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->CanCreatureAttack(who)) { if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -401,7 +401,7 @@ class boss_kaelthas : public CreatureScript float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) { - if (!me->getVictim() && Phase >= 4) + if (!me->GetVictim() && Phase >= 4) { who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH); AttackStart(who); @@ -742,7 +742,7 @@ class boss_kaelthas : public CreatureScript //interruptable me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, false); int32 dmg = 20000+rand()%5000; - me->CastCustomSpell(me->getVictim(), SPELL_FIREBALL, &dmg, 0, 0, false); + me->CastCustomSpell(me->GetVictim(), SPELL_FIREBALL, &dmg, 0, 0, false); IsCastingFireball = true; Fireball_Timer = 2500; } @@ -761,7 +761,7 @@ class boss_kaelthas : public CreatureScript //ArcaneDisruption_Timer if (ArcaneDisruption_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_DISRUPTION, true); + DoCast(me->GetVictim(), SPELL_ARCANE_DISRUPTION, true); ArcaneDisruption_Timer = 60000; } else @@ -842,7 +842,7 @@ class boss_kaelthas : public CreatureScript { if (PyrosCasted < 3) { - DoCast(me->getVictim(), SPELL_PYROBLAST); + DoCast(me->GetVictim(), SPELL_PYROBLAST); ++PyrosCasted; } else @@ -865,7 +865,7 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Phase = 6; - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); } else Phase_Timer -= diff; @@ -959,7 +959,7 @@ class boss_kaelthas : public CreatureScript InGravityLapse = false; GravityLapse_Timer = 60000; GravityLapse_Phase = 0; - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); break; } } @@ -1075,7 +1075,7 @@ class boss_thaladred_the_darkener : public CreatureScript //Silence_Timer if (Silence_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SILENCE); + DoCast(me->GetVictim(), SPELL_SILENCE); Silence_Timer = 20000; } else @@ -1084,7 +1084,7 @@ class boss_thaladred_the_darkener : public CreatureScript //PsychicBlow_Timer if (PsychicBlow_Timer <= diff) { - DoCast(me->getVictim(), SPELL_PSYCHIC_BLOW); + DoCast(me->GetVictim(), SPELL_PSYCHIC_BLOW); PsychicBlow_Timer = 20000+rand()%5000; } else @@ -1153,7 +1153,7 @@ class boss_lord_sanguinar : public CreatureScript //Fear_Timer if (Fear_Timer <= diff) { - DoCast(me->getVictim(), SPELL_BELLOWING_ROAR); + DoCast(me->GetVictim(), SPELL_BELLOWING_ROAR); Fear_Timer = 25000+rand()%10000; //approximately every 30 seconds } else @@ -1254,7 +1254,7 @@ class boss_grand_astromancer_capernian : public CreatureScript //Fireball_Timer if (Fireball_Timer <= diff) { - DoCast(me->getVictim(), SPELL_CAPERNIAN_FIREBALL); + DoCast(me->GetVictim(), SPELL_CAPERNIAN_FIREBALL); Fireball_Timer = 4000; } else @@ -1269,7 +1269,7 @@ class boss_grand_astromancer_capernian : public CreatureScript if (target && me->IsWithinDistInMap(target, 30)) DoCast(target, SPELL_CONFLAGRATION); else - DoCast(me->getVictim(), SPELL_CONFLAGRATION); + DoCast(me->GetVictim(), SPELL_CONFLAGRATION); Conflagration_Timer = 10000+rand()%5000; } @@ -1368,7 +1368,7 @@ class boss_master_engineer_telonicus : public CreatureScript //Bomb_Timer if (Bomb_Timer <= diff) { - DoCast(me->getVictim(), SPELL_BOMB); + DoCast(me->GetVictim(), SPELL_BOMB); Bomb_Timer = 25000; } else @@ -1552,7 +1552,7 @@ class mob_phoenix_egg_tk : public CreatureScript void JustSummoned(Creature* summoned) { - summoned->AddThreat(me->getVictim(), 0.0f); + summoned->AddThreat(me->GetVictim(), 0.0f); summoned->CastSpell(summoned, SPELL_REBIRTH, false); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index d4526e52543..684b37cc245 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -74,7 +74,7 @@ class boss_void_reaver : public CreatureScript Enraged = false; - if (instance && me->isAlive()) + if (instance && me->IsAlive()) instance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } @@ -107,7 +107,7 @@ class boss_void_reaver : public CreatureScript // Pounding if (Pounding_Timer <= diff) { - DoCast(me->getVictim(), SPELL_POUNDING); + DoCast(me->GetVictim(), SPELL_POUNDING); Talk(SAY_POUNDING); Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) } @@ -125,7 +125,7 @@ class boss_void_reaver : public CreatureScript if (!target) continue; // exclude pets & totems, 18 yard radius minimum - if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive() && !target->IsWithinDist(me, 18, false)) + if (target->GetTypeId() == TYPEID_PLAYER && target->IsAlive() && !target->IsWithinDist(me, 18, false)) target_list.push_back(target); target = NULL; } @@ -133,7 +133,7 @@ class boss_void_reaver : public CreatureScript if (!target_list.empty()) target = *(target_list.begin()+rand()%target_list.size()); else - target = me->getVictim(); + target = me->GetVictim(); if (target) me->CastSpell(target, SPELL_ARCANE_ORB, false, NULL, NULL, 0); @@ -144,10 +144,10 @@ class boss_void_reaver : public CreatureScript // Single Target knock back, reduces aggro if (KnockAway_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCK_AWAY); + DoCast(me->GetVictim(), SPELL_KNOCK_AWAY); //Drop 25% aggro - if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(), -25); + if (DoGetThreat(me->GetVictim())) + DoModifyThreatPercent(me->GetVictim(), -25); KnockAway_Timer = 30000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index fd00b2c5b4e..3d72dae58df 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -71,12 +71,12 @@ class mob_crystalcore_devastator : public CreatureScript //Knockaway_Timer if (Knockaway_Timer <= diff) { - DoCast(me->getVictim(), SPELL_KNOCKAWAY, true); + DoCast(me->GetVictim(), SPELL_KNOCKAWAY, true); // current aggro target is knocked away pick new target Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (!target || target == me->getVictim()) + if (!target || target == me->GetVictim()) target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (target) diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index ce1322088e2..5954d885f72 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -206,8 +206,8 @@ class mob_ragin_flames : public CreatureScript if (inferno_Timer <= diff) { - DoCast(me->getVictim(), SPELL_INFERNO); - me->TauntApply(me->getVictim()); + DoCast(me->GetVictim(), SPELL_INFERNO); + me->TauntApply(me->GetVictim()); inferno_Timer = 10000; } else inferno_Timer -= diff; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index d179e47b942..cb687aea432 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -199,7 +199,7 @@ class mob_nether_wraith : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(target, SPELL_ARCANE_MISSILES); else - DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); + DoCast(me->GetVictim(), SPELL_ARCANE_MISSILES); ArcaneMissiles_Timer = urand(5000, 10000); } else diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 2fc0b475cdf..172a5b05a96 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -203,7 +203,7 @@ class npc_millhouse_manastorm : public CreatureScript Talk(SAY_PYRO); - DoCast(me->getVictim(), SPELL_PYROBLAST); + DoCast(me->GetVictim(), SPELL_PYROBLAST); Pyroblast_Timer = 40000; } else @@ -211,7 +211,7 @@ class npc_millhouse_manastorm : public CreatureScript if (Fireball_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBALL); + DoCast(me->GetVictim(), SPELL_FIREBALL); Fireball_Timer = 4000; } else @@ -315,7 +315,7 @@ class npc_warden_mellichar : public CreatureScript if (IsRunning) return; - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index c6f47fe8de7..2e6a4e52d67 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -125,7 +125,7 @@ class boss_harbinger_skyriss : public CreatureScript summon->SetHealth(summon->CountPctFromMaxHealth(33)); else summon->SetHealth(summon->CountPctFromMaxHealth(66)); - if (me->getVictim()) + if (me->GetVictim()) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(target); } @@ -209,7 +209,7 @@ class boss_harbinger_skyriss : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(target, SPELL_MIND_REND); else - DoCast(me->getVictim(), SPELL_MIND_REND); + DoCast(me->GetVictim(), SPELL_MIND_REND); MindRend_Timer = 8000; } @@ -226,7 +226,7 @@ class boss_harbinger_skyriss : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(target, SPELL_FEAR); else - DoCast(me->getVictim(), SPELL_FEAR); + DoCast(me->GetVictim(), SPELL_FEAR); Fear_Timer = 25000; } @@ -243,7 +243,7 @@ class boss_harbinger_skyriss : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(target, SPELL_DOMINATION); else - DoCast(me->getVictim(), SPELL_DOMINATION); + DoCast(me->GetVictim(), SPELL_DOMINATION); Domination_Timer = 16000+rand()%16000; } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 39ca6d32196..f883918db75 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -150,7 +150,7 @@ class boss_high_botanist_freywinn : public CreatureScript { if (Unit* temp = Unit::GetUnit(*me, *itr)) { - if (!temp->isAlive()) + if (!temp->IsAlive()) { Adds_List.erase(itr); ++DeadAddsCount; @@ -170,7 +170,7 @@ class boss_high_botanist_freywinn : public CreatureScript me->InterruptNonMeleeSpells(true); me->RemoveAllAuras(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); MoveFree = true; } MoveCheck_Timer = 500; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 7b4ef77ac10..ad1f6327207 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -163,7 +163,7 @@ class boss_laj : public CreatureScript void JustSummoned(Creature* summon) { - if (summon && me->getVictim()) + if (summon && me->GetVictim()) summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); } @@ -186,7 +186,7 @@ class boss_laj : public CreatureScript if (Allergic_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ALLERGIC_REACTION); + DoCast(me->GetVictim(), SPELL_ALLERGIC_REACTION); Allergic_Timer = 25000+rand()%15000; } else diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 1275550a340..4fb04aaeb2f 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -114,7 +114,7 @@ class mob_warp_splinter_treant : public CreatureScript return; } - if (me->getVictim()->GetGUID() != WarpGuid) + if (me->GetVictim()->GetGUID() != WarpGuid) DoMeleeAttackIfReady(); } }; @@ -198,7 +198,7 @@ class boss_warp_splinter : public CreatureScript //Check for War Stomp if (War_Stomp_Timer <= diff) { - DoCast(me->getVictim(), WAR_STOMP); + DoCast(me->GetVictim(), WAR_STOMP); War_Stomp_Timer = urand(25000, 40000); } else @@ -207,7 +207,7 @@ class boss_warp_splinter : public CreatureScript //Check for Arcane Volley if (Arcane_Volley_Timer <= diff) { - DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H)); + DoCast(me->GetVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H)); Arcane_Volley_Timer = urand(20000, 35000); } else diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 91d9eb53506..0e167987e74 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -238,13 +238,13 @@ public: if (IntangiblePresence_Timer <= diff) { - DoCast(me->getVictim(), SPELL_INTANGIBLE_PRESENCE); + DoCast(me->GetVictim(), SPELL_INTANGIBLE_PRESENCE); IntangiblePresence_Timer = 15000+rand()%15000; } else IntangiblePresence_Timer -= diff; if (ManaBurn_Timer <= diff) { - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); if (target && target->getPowerType() == POWER_MANA) DoCast(target, SPELL_MANA_BURN); ManaBurn_Timer = 8000+rand()%8000; @@ -252,7 +252,7 @@ public: if (ArcaneBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ARCANE_BLAST); + DoCast(me->GetVictim(), SPELL_ARCANE_BLAST); ArcaneBlast_Timer = 2500+rand()%5000; } else ArcaneBlast_Timer -= diff; @@ -499,7 +499,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!who || (!who->isAlive())) + if (!who || (!who->IsAlive())) return; if (me->IsWithinDistInMap(who, 50.0f)) diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 48e0243bf0e..10fd4e126cb 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -113,13 +113,13 @@ public: if (Shock_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SHOCK); + DoCast(me->GetVictim(), SPELL_SHOCK); Shock_Timer = 10000; } else Shock_Timer -= diff; if (EnvelopingWinds_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ENVELOPING_WINDS); + DoCast(me->GetVictim(), SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 25000; } else EnvelopingWinds_Timer -= diff; @@ -194,7 +194,7 @@ public: Talk(EMOTE_WOLF_HOWL); break; case 50: - if (pRyga && pRyga->isAlive() && !pRyga->isInCombat()) + if (pRyga && pRyga->IsAlive() && !pRyga->IsInCombat()) pRyga->AI()->Talk(SAY_WOLF_WELCOME); break; } @@ -229,7 +229,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NALADU_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -279,10 +279,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_REDEEM_MARKS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (player->GetQuestStatus(QUEST_DIGGING_FOR_PRAYER_BEADS) == QUEST_STATUS_INCOMPLETE) @@ -335,7 +335,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 148bfeaeefe..442698ab2da 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -123,7 +123,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE) @@ -254,7 +254,7 @@ public: if (summoned->GetEntry() == NPC_MURK_BRUTE) summoned->AI()->Talk(SAY_MAG_NO_ESCAPE); - if (summoned->isTotem()) + if (summoned->IsTotem()) return; summoned->SetWalk(false); @@ -277,12 +277,12 @@ public: void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); - if (!me->getVictim()) + if (!me->GetVictim()) return; if (m_uiChainLightningTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTNING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING); m_uiChainLightningTimer = urand(7000, 14000); } else @@ -301,7 +301,7 @@ public: if (m_uiFrostShockTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_FROST_SHOCK); + DoCast(me->GetVictim(), SPELL_FROST_SHOCK); m_uiFrostShockTimer = urand(7500, 15000); } else @@ -599,7 +599,7 @@ public: Talk(SAY_KUR_NO_ESCAPE); // This function is for when we summoned enemies to fight - so that does NOT mean we should make our totem count in this! - if (summoned->isTotem()) + if (summoned->IsTotem()) return; summoned->SetWalk(false); @@ -636,7 +636,7 @@ public: if (ChainLightningTimer <= diff) { - DoCast(me->getVictim(), SPELL_KUR_CHAIN_LIGHTNING); + DoCast(me->GetVictim(), SPELL_KUR_CHAIN_LIGHTNING); ChainLightningTimer = urand(7000, 14000); } else ChainLightningTimer -= diff; @@ -651,7 +651,7 @@ public: if (FrostShockTimer <= diff) { - DoCast(me->getVictim(), SPELL_KUR_FROST_SHOCK); + DoCast(me->GetVictim(), SPELL_KUR_FROST_SHOCK); FrostShockTimer = urand(7500, 15000); } else FrostShockTimer -= diff; diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 7af36d381e8..dc0dacc6f95 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -650,7 +650,7 @@ public: if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) return false; - if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE) + if (player->IsAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE) { Creature* Dawnforge = player->FindNearestCreature(CreatureEntry[1], 30.0f); if (!Dawnforge) @@ -701,7 +701,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(29778)) diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 644fd71e7a2..110875f7ace 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -177,7 +177,7 @@ public: if (CastTimer <= diff) { - DoCast(me->getVictim(), SPELL_NETHER_BREATH); + DoCast(me->GetVictim(), SPELL_NETHER_BREATH); CastTimer = 5000; } else CastTimer -= diff; @@ -425,7 +425,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isVendor() && player->GetReputationRank(1015) == REP_EXALTED) + if (creature->IsVendor() && player->GetReputationRank(1015) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -612,9 +612,9 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (player->GetQuestStatus(10519) == QUEST_STATUS_INCOMPLETE) @@ -1351,13 +1351,13 @@ public: { if (SpellTimer1 <= diff) { - DoCast(me->getVictim(), SpawnCast[6].SpellId);//Cleave + DoCast(me->GetVictim(), SpawnCast[6].SpellId);//Cleave SpellTimer1 = SpawnCast[6].Timer2 + (rand()%10 * 1000); } else SpellTimer1 -= diff; if (SpellTimer2 <= diff) { - DoCast(me->getVictim(), SpawnCast[7].SpellId);//Shadowfury + DoCast(me->GetVictim(), SpawnCast[7].SpellId);//Shadowfury SpellTimer2 = SpawnCast[7].Timer2 + (rand()%5 * 1000); } else SpellTimer2 -= diff; @@ -1609,7 +1609,7 @@ public: { if (SpellTimer1 <= diff) { - DoCast(me->getVictim(), SpawnCast[0].SpellId);//Spellbreaker + DoCast(me->GetVictim(), SpawnCast[0].SpellId);//Spellbreaker SpellTimer1 = SpawnCast[0].Timer2 + (rand()%5 * 1000); } else SpellTimer1 -= diff; } @@ -1630,13 +1630,13 @@ public: if (SpellTimer2 <= diff) { - DoCast(me->getVictim(), SpawnCast[2].SpellId);//Psychic Scream + DoCast(me->GetVictim(), SpawnCast[2].SpellId);//Psychic Scream SpellTimer2 = SpawnCast[2].Timer2 + (rand()%13 * 1000); } else SpellTimer2 -= diff; if (SpellTimer3 <= diff) { - DoCast(me->getVictim(), SpawnCast[3].SpellId);//Mind Blast + DoCast(me->GetVictim(), SpawnCast[3].SpellId);//Mind Blast SpellTimer3 = SpawnCast[3].Timer2 + (rand()%8 * 1000); } else SpellTimer3 -= diff; } @@ -1645,13 +1645,13 @@ public: { if (SpellTimer1 <= diff) { - DoCast(me->getVictim(), SpawnCast[4].SpellId);//Curse Of Flames + DoCast(me->GetVictim(), SpawnCast[4].SpellId);//Curse Of Flames SpellTimer1 = SpawnCast[4].Timer2 + (rand()%10 * 1000); } else SpellTimer1 -= diff; if (SpellTimer2 <= diff) { - DoCast(me->getVictim(), SpawnCast[5].SpellId);//Flamestrike + DoCast(me->GetVictim(), SpawnCast[5].SpellId);//Flamestrike SpellTimer2 = SpawnCast[5].Timer2 + (rand()%7 * 13000); } else SpellTimer2 -= diff; } diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 1fb0210bb73..f0c3910e737 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -107,7 +107,7 @@ public: if (Uppercut_Timer <= diff) { - DoCast(me->getVictim(), SPELL_UPPERCUT); + DoCast(me->GetVictim(), SPELL_UPPERCUT); Uppercut_Timer = 15000; } else Uppercut_Timer -= diff; @@ -140,7 +140,7 @@ public: } else { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } @@ -181,7 +181,7 @@ public: if (MagneticPull_Timer <= diff) { - DoCast(me->getVictim(), SPELL_MAGNETIC_PULL); + DoCast(me->GetVictim(), SPELL_MAGNETIC_PULL); MagneticPull_Timer = 15000; } else MagneticPull_Timer -= diff; @@ -220,7 +220,7 @@ public: if (creature->GetEntry() == 23484) { // Aldor vendor - if (creature->isVendor() && (player->GetReputationRank(932) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->GetReputationRank(942) == REP_EXALTED)) + if (creature->IsVendor() && (player->GetReputationRank(932) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->GetReputationRank(942) == REP_EXALTED)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(11085, creature->GetGUID()); @@ -234,7 +234,7 @@ public: if (creature->GetEntry() == 23483) { // Scryers vendor - if (creature->isVendor() && (player->GetReputationRank(934) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->GetReputationRank(942) == REP_EXALTED)) + if (creature->IsVendor() && (player->GetReputationRank(934) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->GetReputationRank(942) == REP_EXALTED)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(11085, creature->GetGUID()); @@ -448,7 +448,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -515,7 +515,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (!player->hasQuest(10211)) diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 85a45193931..73991466f6e 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -106,7 +106,7 @@ public: { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* groupie = itr->getSource(); + Player* groupie = itr->GetSource(); if (groupie && groupie->GetQuestStatus(QUEST_DONTKILLTHEFATONE) == QUEST_STATUS_INCOMPLETE && groupie->GetReqKillOrCastCurrentCount(QUEST_DONTKILLTHEFATONE, 18260) == 10) @@ -417,7 +417,7 @@ public: if (Silence_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SILENCE); + DoCast(me->GetVictim(), SPELL_SILENCE); Silence_Timer = 30000; } else Silence_Timer -= diff; @@ -429,7 +429,7 @@ public: if (Frostbolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FROSTBOLT); + DoCast(me->GetVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 5000; } else Frostbolt_Timer -= diff; @@ -617,7 +617,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) + if (creature->IsVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(9896, creature->GetGUID()); diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index b4899189af5..27143d47b8d 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -199,7 +199,7 @@ public: if (LightningBolt_Timer <= diff) { - DoCast(me->getVictim(), SPELL_LIGHTNING_BOLT); + DoCast(me->GetVictim(), SPELL_LIGHTNING_BOLT); LightningBolt_Timer = 5000; } else LightningBolt_Timer -= diff; @@ -302,7 +302,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isVendor() && player->GetReputationRank(942) == REP_EXALTED) + if (creature->IsVendor() && player->GetReputationRank(942) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -416,10 +416,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_POISONS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TIMOTHY_DANIELS_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 96495232aeb..f4f7ca5fa42 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -329,7 +329,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader if (Unit* unitTarget = GetHitUnit()) { int32 bp = 0; - if (unitTarget->isAlive()) // Living ghoul as a target + if (unitTarget->IsAlive()) // Living ghoul as a target { bp = int32(unitTarget->CountPctFromMaxHealth(25)); unitTarget->CastCustomSpell(unitTarget, SPELL_DK_GHOUL_EXPLODE, &bp, NULL, NULL, false); @@ -516,7 +516,7 @@ class spell_dk_death_pact : public SpellScriptLoader if (Player* player = GetCaster()->ToPlayer()) for (Unit::ControlList::const_iterator itr = player->m_Controlled.begin(); itr != player->m_Controlled.end(); ++itr) if (Creature* undeadPet = (*itr)->ToCreature()) - if (undeadPet->isAlive() && + if (undeadPet->IsAlive() && undeadPet->GetOwnerGUID() == player->GetGUID() && undeadPet->GetCreatureType() == CREATURE_TYPE_UNDEAD && undeadPet->IsWithinDist(player, 100.0f, false)) diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index cb010f44f9a..b727aa6f0e6 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3520,7 +3520,7 @@ class spell_gen_two_forms : public SpellScriptLoader SpellCastResult CheckCast() { - if (GetCaster()->isInCombat()) + if (GetCaster()->IsInCombat()) { SetCustomCastResultMessage(SPELL_CUSTOM_ERROR_CANT_TRANSFORM); return SPELL_FAILED_CUSTOM_ERROR; diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 08f65d8323f..2965d6a7a5f 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -252,7 +252,7 @@ class spell_hun_disengage : public SpellScriptLoader SpellCastResult CheckCast() { Unit* caster = GetCaster(); - if (caster->GetTypeId() == TYPEID_PLAYER && !caster->isInCombat()) + if (caster->GetTypeId() == TYPEID_PLAYER && !caster->IsInCombat()) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; return SPELL_CAST_OK; @@ -482,7 +482,7 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader bool Load() { - if (!GetCaster()->isPet()) + if (!GetCaster()->IsPet()) return false; return true; } @@ -539,7 +539,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader bool Load() { - if (!GetCaster()->isPet()) + if (!GetCaster()->IsPet()) return false; return true; } @@ -743,7 +743,7 @@ class spell_hun_tame_beast : public SpellScriptLoader return SPELL_FAILED_HIGHLEVEL; // use SMSG_PET_TAME_FAILURE? - if (!target->GetCreatureTemplate()->isTameable(caster->ToPlayer()->CanTameExoticPets())) + if (!target->GetCreatureTemplate()->IsTameable(caster->ToPlayer()->CanTameExoticPets())) return SPELL_FAILED_BAD_TARGETS; if (caster->GetPetGUID()) diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index a8407525a1b..fa5388ada33 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -832,7 +832,7 @@ class spell_item_unsated_craving : public SpellScriptLoader return false; Unit* target = procInfo.GetActionTarget(); - if (!target || target->GetTypeId() != TYPEID_UNIT || target->GetCreatureType() == CREATURE_TYPE_CRITTER || (target->GetEntry() != NPC_SINDRAGOSA && target->isSummon())) + if (!target || target->GetTypeId() != TYPEID_UNIT || target->GetCreatureType() == CREATURE_TYPE_CRITTER || (target->GetEntry() != NPC_SINDRAGOSA && target->IsSummon())) return false; return true; @@ -915,7 +915,7 @@ class spell_item_shadowmourne : public SpellScriptLoader { if (GetTarget()->HasAura(SPELL_SHADOWMOURNE_CHAOS_BANE_BUFF)) // cant collect shards while under effect of Chaos Bane buff return false; - return eventInfo.GetProcTarget() && eventInfo.GetProcTarget()->isAlive(); + return eventInfo.GetProcTarget() && eventInfo.GetProcTarget()->IsAlive(); } void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) @@ -1640,7 +1640,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader void HandleDummy(SpellEffIndex /* effIndex */) { if (Creature* target = GetHitCreature()) - if (target->isDead() && !target->isPet()) + if (target->isDead() && !target->IsPet()) { GetCaster()->SummonGameObject(OBJECT_IMPRISONED_DOOMGUARD, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), 0, 0, 0, 0, uint32(target->GetRespawnTime()-time(NULL))); target->DespawnOrUnsummon(); diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index c1edf4b05d4..5f3d17b0056 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -496,7 +496,7 @@ class spell_mage_focus_magic : public SpellScriptLoader bool CheckProc(ProcEventInfo& /*eventInfo*/) { _procTarget = GetCaster(); - return _procTarget && _procTarget->isAlive(); + return _procTarget && _procTarget->IsAlive(); } void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index e137ef955db..8c337f30ec3 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -240,7 +240,7 @@ public: void CalculateStaminaAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = CalculatePct(owner->GetStat(STAT_STAMINA), 75); @@ -284,7 +284,7 @@ public: void RemoveEffect(AuraEffect const* /* aurEff */, AuraEffectHandleModes /*mode*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) { PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel()); pet->ToPet()->SetCreateHealth(pInfo->health); @@ -294,7 +294,7 @@ public: void CalculateAttackPowerAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { @@ -322,7 +322,7 @@ public: void CalculateDamageDoneAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { //the damage bonus used for pets is either fire or shadow damage, whatever is higher @@ -377,7 +377,7 @@ public: void CalculateIntellectAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -420,7 +420,7 @@ public: void RemoveEffect(AuraEffect const* /* aurEff */, AuraEffectHandleModes /*mode*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) { PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel()); pet->ToPet()->SetCreateMana(pInfo->mana); @@ -430,7 +430,7 @@ public: void CalculateArmorAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -442,7 +442,7 @@ public: void CalculateFireResistanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -489,7 +489,7 @@ public: void CalculateFrostResistanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -501,7 +501,7 @@ public: void CalculateArcaneResistanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -513,7 +513,7 @@ public: void CalculateNatureResistanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -556,7 +556,7 @@ public: void CalculateShadowResistanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float ownerBonus = 0.0f; @@ -795,7 +795,7 @@ public: void CalculateAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) if (AuraEffect* /* aurEff */ect = owner->GetAuraEffect(SPELL_WARLOCK_GLYPH_OF_VOIDWALKER, EFFECT_0)) amount += /* aurEff */ect->GetAmount(); @@ -885,7 +885,7 @@ public: void CalculateStaminaAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* pet = GetUnitOwner()) - if (pet->isPet()) + if (pet->IsPet()) if (Unit* owner = pet->ToPet()->GetOwner()) { float mod = 0.45f; @@ -924,7 +924,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -954,7 +954,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1019,7 +1019,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1038,7 +1038,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1057,7 +1057,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1106,7 +1106,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1125,7 +1125,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1144,7 +1144,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isPet()) + if (!pet->IsPet()) return; Unit* owner = pet->ToPet()->GetOwner(); @@ -1472,7 +1472,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (pet->isGuardian()) + if (pet->IsGuardian()) { if (Unit* owner = pet->GetOwner()) { @@ -1511,7 +1511,7 @@ public: { if (Unit* pet = GetUnitOwner()) { - if (!pet->isGuardian()) + if (!pet->IsGuardian()) return; Unit* owner = pet->GetOwner(); @@ -1685,7 +1685,7 @@ public: if (!owner) return; - if (pet->isGuardian()) + if (pet->IsGuardian()) ((Guardian*)pet)->SetBonusDamage(owner->GetTotalAttackPowerValue(BASE_ATTACK)); amount += owner->CalculateDamage(BASE_ATTACK, true, true); diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index c2bfc913893..c1364c4e699 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -449,7 +449,7 @@ class spell_pri_penance : public SpellScriptLoader Unit* caster = GetCaster(); if (Unit* unitTarget = GetHitUnit()) { - if (!unitTarget->isAlive()) + if (!unitTarget->IsAlive()) return; uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 4cc464af9ab..013dfda809d 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -50,7 +50,7 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* creatureTarget = GetHitCreature()) - if (!creatureTarget->isPet() && creatureTarget->GetEntry() == _originalEntry) + if (!creatureTarget->IsPet() && creatureTarget->GetEntry() == _originalEntry) { creatureTarget->UpdateEntry(_newEntry); if (_shouldAttack && creatureTarget->IsAIEnabled) @@ -86,6 +86,47 @@ class spell_q55_sacred_cleansing : public SpellScriptLoader } }; +// 9712 - Thaumaturgy Channel +enum ThaumaturgyChannel +{ + SPELL_THAUMATURGY_CHANNEL = 21029 +}; + +class spell_q2203_thaumaturgy_channel : public SpellScriptLoader +{ + public: + spell_q2203_thaumaturgy_channel() : SpellScriptLoader("spell_q2203_thaumaturgy_channel") { } + + class spell_q2203_thaumaturgy_channel_AuraScript : public AuraScript + { + PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript); + + bool Validate(SpellInfo const* /*spellInfo*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_THAUMATURGY_CHANNEL)) + return false; + return true; + } + + void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) + { + PreventDefaultAction(); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_THAUMATURGY_CHANNEL, false); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_q2203_thaumaturgy_channel_AuraScript(); + } +}; + // http://www.wowhead.com/quest=5206 Marauders of Darrowshire // 17271 Test Fetid Skull enum Quest5206Data @@ -1561,6 +1602,44 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader } }; +enum QuenchingMist +{ + SPELL_FLICKERING_FLAMES = 53504 +}; + +class spell_q12730_quenching_mist : public SpellScriptLoader +{ + public: + spell_q12730_quenching_mist() : SpellScriptLoader("spell_q12730_quenching_mist") { } + + class spell_q12730_quenching_mist_AuraScript : public AuraScript + { + PrepareAuraScript(spell_q12730_quenching_mist_AuraScript); + + bool Validate(SpellInfo const* /*spellInfo*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_FLICKERING_FLAMES)) + return false; + return true; + } + + void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) + { + GetTarget()->RemoveAurasDueToSpell(SPELL_FLICKERING_FLAMES); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_q12730_quenching_mist_AuraScript(); + } +}; + // 13291 - Borrowed Technology/13292 - The Solution Solution /Daily//13239 - Volatility/13261 - Volatiliy /Daily// enum Quest13291_13292_13239_13261Data { @@ -1674,6 +1753,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader void AddSC_quest_spell_scripts() { new spell_q55_sacred_cleansing(); + new spell_q2203_thaumaturgy_channel(); new spell_q5206_test_fetid_skull(); new spell_q6124_6129_apply_salve(); new spell_q10255_administer_antidote(); @@ -1709,6 +1789,7 @@ void AddSC_quest_spell_scripts() new spell_q11010_q11102_q11023_q11008_check_fly_mount(); new spell_q12372_azure_on_death_force_whisper(); new spell_q12527_zuldrak_rat(); + new spell_q12730_quenching_mist(); new spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy(); new spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon(); new spell_q12847_summon_soul_moveto_bunny(); diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 867d619018c..12a5afb1683 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -388,7 +388,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); - Unit* victim = target->getVictim(); + Unit* victim = target->GetVictim(); if (victim && (target->GetHealthPct() > victim->GetHealthPct())) { if (!target->HasAura(SPELL_ROGUE_PREY_ON_THE_WEAK)) diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 853e494ec1f..d05ee843d44 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -409,7 +409,7 @@ class spell_warl_demon_soul : public SpellScriptLoader Unit* caster = GetCaster(); if (Creature* targetCreature = GetHitCreature()) { - if (targetCreature->isPet()) + if (targetCreature->IsPet()) { CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(targetCreature->GetEntry()); switch (ci->family) @@ -468,7 +468,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { if (Creature* targetCreature = GetHitCreature()) { - if (targetCreature->isPet()) + if (targetCreature->IsPet()) { CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(targetCreature->GetEntry()); switch (ci->family) diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index c8436dfa1f0..391c7b75c89 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -91,7 +91,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { - if (player->isAlive() && !player->isInCombat()) + if (player->IsAlive() && !player->IsInCombat()) { if (player->GetTeam() == ALLIANCE && player->GetQuestRewardStatus(QUEST_GAINING_ACCESS_A)) { @@ -284,7 +284,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { - if (!player->isAlive() || !player->HasAura(SPELL_FISH_PASTE)) + if (!player->IsAlive() || !player->HasAura(SPELL_FISH_PASTE)) return false; if (player->GetQuestStatus(QUEST_NATS_BARGAIN) == QUEST_STATUS_INCOMPLETE) @@ -384,7 +384,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript { float x = 0.0f, y = 0.0f, z = 0.0f; - if (!player->isAlive()) + if (!player->IsAlive()) return false; uint32 triggerId = trigger->id; diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 4e95a6162d3..9c12be9c916 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -593,7 +593,7 @@ class boss_taerar : public CreatureScript uint32 count = sizeof(TaerarShadeSpells) / sizeof(uint32); for (uint32 i = 0; i < count; ++i) - DoCast(me->getVictim(), TaerarShadeSpells[i], true); + DoCast(me->GetVictim(), TaerarShadeSpells[i], true); _shades += count; DoCast(SPELL_SHADE); @@ -624,7 +624,7 @@ class boss_taerar : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; if (_banished) diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 3634209cc8f..393244c9ac5 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -317,7 +317,7 @@ public: { if (!creature->IsHostileTo(player)) { - if (FactionTemplateEntry const* pFaction = creature->getFactionTemplateEntry()) + if (FactionTemplateEntry const* pFaction = creature->GetFactionTemplateEntry()) { uint32 Spell = 0; @@ -825,7 +825,7 @@ public: pPrisoner = go->FindNearestCreature(NPC_EBON_BLADE_PRISONER_NE, 5.0f, true); } } - if (!pPrisoner || !pPrisoner->isAlive()) + if (!pPrisoner || !pPrisoner->IsAlive()) return false; pPrisoner->DisappearAndDie(); @@ -1066,7 +1066,7 @@ public: } } - if (!pPrisoner || !pPrisoner->isAlive()) + if (!pPrisoner || !pPrisoner->IsAlive()) return true; Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_PRISONERS_OF_WYRMSKULL); diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index bff30f6cca5..8c477c38c2b 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -79,7 +79,7 @@ public: globalCooldown = 0; //Buff timer (only buff when we are alive and not in combat - if (me->isAlive() && !me->isInCombat()) + if (me->IsAlive() && !me->IsInCombat()) { if (buffTimer <= diff) { @@ -109,7 +109,7 @@ public: if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false)) { //If we are within range melee the target - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { bool healing = false; SpellInfo const* info = NULL; @@ -122,7 +122,7 @@ public: if (info) healing = true; else - info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); + info = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); //20% chance to replace our white hit with a spell if (info && urand(0, 99) < 20 && !globalCooldown) @@ -131,13 +131,13 @@ public: if (healing) DoCast(me, info->Id); else - DoCast(me->getVictim(), info->Id); + DoCast(me->GetVictim(), info->Id); //Set our global cooldown globalCooldown = GENERIC_CREATURE_COOLDOWN; } else - me->AttackerStateUpdate(me->getVictim()); + me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } @@ -158,7 +158,7 @@ public: if (info) healing = true; else - info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); + info = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); //Found a spell, check if we arn't on cooldown if (info && !globalCooldown) @@ -174,7 +174,7 @@ public: if (healing) DoCast(me, info->Id); else - DoCast(me->getVictim(), info->Id); + DoCast(me->GetVictim(), info->Id); //Set our global cooldown globalCooldown = GENERIC_CREATURE_COOLDOWN; @@ -184,7 +184,7 @@ public: //Cancel our current spell and then mutate new movement generator me->InterruptNonMeleeSpells(false); me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } } } @@ -294,7 +294,7 @@ public: } else if (banishTimer <= diff) { - Unit* temp = me->getVictim(); + Unit* temp = me->GetVictim(); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { DoCast(temp, SPELL_BANISHED_SHATTRATH_A); @@ -359,7 +359,7 @@ public: } else if (banishTimer <= diff) { - Unit* temp = me->getVictim(); + Unit* temp = me->GetVictim(); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { DoCast(temp, SPELL_BANISHED_SHATTRATH_S); diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 23b1c5e22e9..8eb54d46bdf 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -72,7 +72,7 @@ public: } // allow use in flight only - if (player->isInFlight() && !disabled) + if (player->IsInFlight() && !disabled) return false; // error diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index d0ac142e050..f9b08d17f9b 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -63,7 +63,7 @@ public: else GlobalCooldown = 0; //Buff timer (only buff when we are alive and not in combat - if (!me->isInCombat() && me->isAlive()) + if (!me->IsInCombat() && me->IsAlive()) { if (BuffTimer <= diff) { @@ -90,7 +90,7 @@ public: return; //If we are within range melee the target - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { //Make sure our attack is ready and we arn't currently casting if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false)) @@ -104,19 +104,19 @@ public: //No healing spell available, select a hostile spell if (info) Healing = true; - else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); + else info = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); //50% chance if elite or higher, 20% chance if not, to replace our white hit with a spell if (info && (rand() % (me->GetCreatureTemplate()->rank > 1 ? 2 : 5) == 0) && !GlobalCooldown) { //Cast the spell if (Healing)DoCastSpell(me, info); - else DoCastSpell(me->getVictim(), info); + else DoCastSpell(me->GetVictim(), info); //Set our global cooldown GlobalCooldown = GENERIC_CREATURE_COOLDOWN; } - else me->AttackerStateUpdate(me->getVictim()); + else me->AttackerStateUpdate(me->GetVictim()); me->resetAttackTimer(); } @@ -135,7 +135,7 @@ public: //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE) if (info) Healing = true; - else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); + else info = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); //Found a spell, check if we arn't on cooldown if (info && !GlobalCooldown) @@ -146,7 +146,7 @@ public: //Cast spell if (Healing) DoCastSpell(me, info); - else DoCastSpell(me->getVictim(), info); + else DoCastSpell(me->GetVictim(), info); //Set our global cooldown GlobalCooldown = GENERIC_CREATURE_COOLDOWN; diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 4a289c55794..4d181880c99 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -62,13 +62,13 @@ public: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID); } - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (creature->isInnkeeper()) + if (creature->IsInnkeeper()) { const char* localizedEntry; switch (player->GetSession()->GetSessionDbcLocale()) diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index c403fe74d12..83826bbc4ad 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -384,13 +384,13 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (creature->isTrainer()) + if (creature->IsTrainer()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); if (player->HasSkill(SKILL_ALCHEMY) && player->GetBaseSkillValue(SKILL_ALCHEMY) >= 350 && player->getLevel() > 67) @@ -549,13 +549,13 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (creature->isTrainer()) + if (creature->IsTrainer()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); uint32 creatureId = creature->GetEntry(); @@ -888,13 +888,13 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (creature->isTrainer()) + if (creature->IsTrainer()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); if (player->HasSkill(SKILL_LEATHERWORKING) && player->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && player->getLevel() > 49) @@ -1011,13 +1011,13 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (creature->isTrainer()) + if (creature->IsTrainer()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //TAILORING SPEC diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 778ab370597..5e1e205dd98 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -67,7 +67,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); switch (creature->GetEntry()) @@ -164,7 +164,7 @@ public: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25); break; case 26602: - if (creature->isTaxi()) + if (creature->IsTaxi()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TAXI, GOSSIP_THRICESTAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26); if (player->GetQuestStatus(11692) == QUEST_STATUS_COMPLETE) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 960a3fce7cd..868531c6ad4 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -180,7 +180,7 @@ public: { Creature* creature = Unit::GetCreature(*me, SpawnedGUID); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) return creature; return NULL; @@ -225,7 +225,7 @@ public: } if (markAura->GetDuration() < AURA_DURATION_TIME_LEFT) - if (!lastSpawnedGuard->getVictim()) + if (!lastSpawnedGuard->GetVictim()) lastSpawnedGuard->AI()->AttackStart(who); } else @@ -252,7 +252,7 @@ public: return; // ROOFTOP only triggers if the player is on the ground - if (!playerTarget->IsFlying() && !lastSpawnedGuard->getVictim()) + if (!playerTarget->IsFlying() && !lastSpawnedGuard->GetVictim()) lastSpawnedGuard->AI()->AttackStart(who); break; @@ -756,7 +756,7 @@ public: void SpellHit(Unit* caster, SpellInfo const* spell) { Player* player = caster->ToPlayer(); - if (!player || !me->isAlive() || spell->Id != 20804) + if (!player || !me->IsAlive() || spell->Id != 20804) return; if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE) @@ -796,10 +796,10 @@ public: void UpdateAI(uint32 /*diff*/) { //lower HP on every world tick makes it a useful counter, not officlone though - if (me->isAlive() && me->GetHealth() > 6) + if (me->IsAlive() && me->GetHealth() > 6) me->ModifyHealth(-5); - if (me->isAlive() && me->GetHealth() <= 6) + if (me->IsAlive() && me->GetHealth() <= 6) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -941,7 +941,7 @@ public: if (spell->Id == SPELL_LESSER_HEAL_R2 || spell->Id == SPELL_FORTITUDE_R1) { //not while in combat - if (me->isInCombat()) + if (me->IsInCombat()) return; //nothing to be done now @@ -1053,7 +1053,7 @@ public: void UpdateAI(uint32 diff) { - if (CanRun && !me->isInCombat()) + if (CanRun && !me->IsInCombat()) { if (RunAwayTimer <= diff) { @@ -1130,7 +1130,7 @@ public: if (me->isAttackReady()) { - DoCast(me->getVictim(), SPELL_DEATHTOUCH, true); + DoCast(me->GetVictim(), SPELL_DEATHTOUCH, true); me->resetAttackTimer(); } } @@ -1153,7 +1153,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); bool canBuy = false; @@ -1219,7 +1219,7 @@ public: if (canBuy) { - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } @@ -1251,10 +1251,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (creature->isTrainer()) + if (creature->IsTrainer()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); if (player->getClass() == CLASS_ROGUE) @@ -1357,7 +1357,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->HasSpellCooldown(SPELL_INT) || @@ -1624,7 +1624,7 @@ public: me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER, float(Info->attackpower)); // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target - if (!me->getVictim() && me->isSummon()) + if (!me->GetVictim() && me->IsSummon()) if (Unit* Owner = me->ToTempSummon()->GetSummoner()) if (Owner->getAttackerForHelper()) AttackStart(Owner->getAttackerForHelper()); @@ -1633,7 +1633,7 @@ public: //Redefined for random target selection: void MoveInLineOfSight(Unit* who) { - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { if (me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -1656,7 +1656,7 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->HasBreakableByDamageCrowdControlAura(me)) + if (me->GetVictim()->HasBreakableByDamageCrowdControlAura(me)) { me->InterruptNonMeleeSpells(false); return; @@ -1674,7 +1674,7 @@ public: else spell = SPELL_CRIPPLING_POISON; - DoCast(me->getVictim(), spell); + DoCast(me->GetVictim(), spell); } SpellTimer = VIPER_TIMER; @@ -1682,7 +1682,7 @@ public: else //Venomous Snake { if (urand(0, 2) == 0) //33% chance to cast - DoCast(me->getVictim(), SPELL_DEADLY_POISON); + DoCast(me->GetVictim(), SPELL_DEADLY_POISON); SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() % 5) * 100; } } @@ -1826,7 +1826,7 @@ public: // Do not reload Creature templates on evade mode enter - prevent visual lost void EnterEvadeMode() { - if (me->IsInEvadeMode() || !me->isAlive()) + if (me->IsInEvadeMode() || !me->IsAlive()) return; Unit* owner = me->GetCharmerOrOwner(); @@ -1888,7 +1888,7 @@ public: // Fly away when dismissed void SpellHit(Unit* source, SpellInfo const* spell) { - if (spell->Id != 50515 || !me->isAlive()) + if (spell->Id != 50515 || !me->IsAlive()) return; Unit* owner = me->GetOwner(); @@ -1951,7 +1951,7 @@ class npc_lightwell : public CreatureScript void EnterEvadeMode() { - if (!me->isAlive()) + if (!me->IsAlive()) return; me->DeleteThreatList(); @@ -2065,7 +2065,7 @@ class npc_shadowfiend : public CreatureScript void JustDied(Unit* /*killer*/) { - if (me->isSummon()) + if (me->IsSummon()) if (Unit* owner = me->ToTempSummon()->GetSummoner()) if (owner->HasAura(GLYPH_OF_SHADOWFIEND)) owner->CastSpell(owner, GLYPH_OF_SHADOWFIEND_MANA, true); @@ -2116,7 +2116,7 @@ public: if (FireShield_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIRESHIELD); + DoCast(me->GetVictim(), SPELL_FIRESHIELD); FireShield_Timer = 2 * IN_MILLISECONDS; } else @@ -2124,7 +2124,7 @@ public: if (FireBlast_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBLAST); + DoCast(me->GetVictim(), SPELL_FIREBLAST); FireBlast_Timer = 5000 + rand() % 15000; // 5-20 sec cd } else @@ -2132,7 +2132,7 @@ public: if (FireNova_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FIRENOVA); + DoCast(me->GetVictim(), SPELL_FIRENOVA); FireNova_Timer = 5000 + rand() % 15000; // 5-20 sec cd } else @@ -2177,7 +2177,7 @@ public: if (AngeredEarth_Timer <= diff) { - DoCast(me->getVictim(), SPELL_ANGEREDEARTH); + DoCast(me->GetVictim(), SPELL_ANGEREDEARTH); AngeredEarth_Timer = 5000 + rand() % 15000; // 5-20 sec cd } else @@ -2243,7 +2243,7 @@ class npc_wormhole : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isSummon()) + if (creature->IsSummon()) { if (player == creature->ToTempSummon()->GetSummoner()) { @@ -2327,7 +2327,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->getClass() == CLASS_HUNTER) diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 4c3630b175d..6be75c296d8 100644 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -93,7 +93,7 @@ template <class TO, class FROM> class Reference : public LinkedListElement TO* operator ->() const { return iRefTo; } TO* getTarget() const { return iRefTo; } - FROM* getSource() const { return iRefFrom; } + FROM* GetSource() const { return iRefFrom; } }; //===================================================== |