diff options
| author | Malcrom <malcromdev@gmail.com> | 2013-06-11 21:25:12 -0230 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2013-06-11 21:25:12 -0230 |
| commit | ec474a62e562b3264cc05346fe4c9a1d4f969645 (patch) | |
| tree | adca8bc224ca567a5070eee9b2b762fff0e7528d /src/server/game | |
| parent | 66978cfc3b672309ed79da917695bc59427974aa (diff) | |
Core: More Function Renaming.
Diffstat (limited to 'src/server/game')
62 files changed, 381 insertions, 381 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 5156c973857..2a13e5c71bf 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -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; diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 96f60cc4d56..d8644c50b35 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -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/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 0f19f98e125..09a6725485a 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -88,9 +88,9 @@ 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()) @@ -130,11 +130,11 @@ void CreatureAI::MoveInLineOfSight(Unit* who) 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) // && 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->CanStartAttack(who->GetVictim(), true)) /// @todo if we use true, it will not attack it when it arrives // me->GetMotionMaster()->MoveChase(who->GetVictim()); } 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/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 636389023d3..9feb30ce3c6 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -312,7 +312,7 @@ 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* player = itr->GetSource()) if (player->IsAlive()) player->TeleportTo(me->GetMapId(), x, y, z, o, TELE_TO_NOT_LEAVE_COMBAT); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 1ce7d060922..4fb7232711c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -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; } diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index b7ebaab0172..1c76399aa5c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -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()); @@ -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)) { @@ -321,7 +321,7 @@ 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)) { diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index f1f199da721..22710739b62 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -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); @@ -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; @@ -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)) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 4ab7be9b160..2abc526134c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -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 diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index c6a9579a201..3a39091895f 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -463,7 +463,7 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin TC_LOG_DEBUG(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::ResetAchievementCriteria(%u, %u, %u)", type, miscvalue1, miscvalue2); // disable for gamemasters with GM-mode enabled - if (m_player->isGameMaster()) + if (m_player->IsGameMaster()) return; AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr->GetAchievementCriteriaByType(type); @@ -773,7 +773,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui TC_LOG_DEBUG(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::UpdateAchievementCriteria(%u, %u, %u)", type, miscValue1, miscValue2); // disable for gamemasters with GM-mode enabled - if (m_player->isGameMaster()) + if (m_player->IsGameMaster()) return; AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr->GetAchievementCriteriaByType(type); @@ -2039,7 +2039,7 @@ void AchievementMgr::RemoveTimedAchievement(AchievementCriteriaTimedTypes type, void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) { // disable for gamemasters with GM-mode enabled - if (m_player->isGameMaster()) + if (m_player->IsGameMaster()) return; if (achievement->flags & ACHIEVEMENT_FLAG_COUNTER || HasAchieved(achievement->ID)) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 96f04bb9997..4c2fc571ee3 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -528,7 +528,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(); diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 1dc9189d80c..e52d64a4f72 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/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp index 5b228229e89..eb389405c80 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 95e835baa5a..b24979d9131 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -67,7 +67,7 @@ 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 @@ -128,8 +128,8 @@ void HostileReference::sourceObjectDestroyLink() void HostileReference::fireStatusChanged(ThreatRefStatusChangeEvent& threatRefStatusChangeEvent) { - if (getSource()) - getSource()->processThreatEvent(&threatRefStatusChangeEvent); + if (GetSource()) + GetSource()->processThreatEvent(&threatRefStatusChangeEvent); } //============================================================ @@ -151,7 +151,7 @@ void HostileReference::addThreat(float modThreat) { 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 + 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/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 4de394c7714..529ca8dc9ec 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -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 7bb8c626a3f..ebf174fdd8a 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); @@ -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(); 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 a187f51554d..f893eecd9d2 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -556,7 +556,7 @@ void Creature::Update(uint32 diff) 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 + !GetVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->IsGameMaster()); // or the victim/owner/charmer is not a GameMaster /*if (m_regenTimer <= diff) {*/ @@ -1333,7 +1333,7 @@ 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()) return false; @@ -1365,7 +1365,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); @@ -1927,7 +1927,7 @@ void Creature::SaveRespawnTime() } // 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; @@ -2080,9 +2080,9 @@ 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()) diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index e5534d3070b..056b8c26713 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -155,18 +155,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(); } }; @@ -487,7 +487,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; @@ -599,7 +599,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/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 597d6863654..54d309bfceb 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -532,7 +532,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()) @@ -543,7 +543,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); @@ -577,7 +577,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; } @@ -605,7 +605,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]; @@ -629,7 +629,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 @@ -734,21 +734,21 @@ 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); *data << uint16(-1); break; case GAMEOBJECT_TYPE_GENERIC: - if (target->isGameMaster()) + if (target->IsGameMaster()) *data << uint16(0); else *data << uint16(GO_DYNFLAG_LO_SPARKLE); *data << uint16(-1); 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); @@ -1962,7 +1962,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; @@ -2285,8 +2285,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) @@ -3159,7 +3159,7 @@ struct WorldObjectChangeAccumulator Player* source = NULL; for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - source = iter->getSource(); + source = iter->GetSource(); BuildPacket(source); @@ -3177,7 +3177,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(); @@ -3192,7 +3192,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 ffbcd38049f..f1e8c7270f4 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -609,7 +609,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 9e395a9572a..61b8ba5ea27 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -161,7 +161,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; } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d0471c183a8..0e91b618b6f 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -455,7 +455,7 @@ 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 (Player* member = itr->GetSource()) if (member->IsAlive() && member->IsAtGroupRewardDistance(_victim)) { const uint8 lvl = member->getLevel(); @@ -598,7 +598,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)) { @@ -2197,7 +2197,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 @@ -4498,7 +4498,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); } */ @@ -16066,7 +16066,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()) @@ -18715,7 +18715,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; @@ -18790,7 +18790,7 @@ bool Player::CheckInstanceLoginValid() if (!GetMap()) return false; - if (!GetMap()->IsDungeon() || isGameMaster()) + if (!GetMap()->IsDungeon() || IsGameMaster()) return true; if (GetMap()->IsRaid()) @@ -20305,7 +20305,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); @@ -21518,7 +21518,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 { @@ -21558,7 +21558,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)) @@ -21995,7 +21995,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) { @@ -22180,7 +22180,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); @@ -22195,7 +22195,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); @@ -22256,7 +22256,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); @@ -22270,7 +22270,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); @@ -23497,7 +23497,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; @@ -23545,7 +23545,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; @@ -23790,7 +23790,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) && @@ -23832,7 +23832,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 @@ -24637,7 +24637,7 @@ void Player::_LoadSkills(PreparedQueryResult result) uint32 Player::GetPhaseMaskForSpawn() const { uint32 phase = PHASEMASK_NORMAL; - if (!isGameMaster()) + if (!IsGameMaster()) phase = GetPhaseMask(); else { @@ -24730,7 +24730,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)) { @@ -25113,7 +25113,7 @@ bool Player::IsPetNeedBeTemporaryUnsummoned() const 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 b05a08446c0..9e5347dee03 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1126,7 +1126,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; } @@ -1944,7 +1944,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; } @@ -2266,7 +2266,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 33eab81849d..3b283ca39c2 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -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 f41b5c2f001..8e889fe4881 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; - 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/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 2737634c538..49e1bb5ef79 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6318,7 +6318,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())) @@ -8941,7 +8941,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 @@ -9755,7 +9755,7 @@ 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)) @@ -11784,7 +11784,7 @@ bool Unit::isTargetableForAttack(bool checkFakeDeath) const 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)); @@ -11806,7 +11806,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 @@ -11815,7 +11815,7 @@ 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 @@ -11923,7 +11923,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 @@ -11932,7 +11932,7 @@ 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 @@ -12529,7 +12529,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()) @@ -12557,7 +12557,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()) @@ -12618,7 +12618,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; @@ -12663,7 +12663,7 @@ Unit* Creature::SelectVictim() else return NULL; - if (target && _IsTargetAcceptable(target) && canCreatureAttack(target)) + if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target)) { SetInFront(target); return target; @@ -12683,7 +12683,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; } @@ -12697,7 +12697,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; } @@ -12933,13 +12933,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 @@ -12968,7 +12968,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) { @@ -16082,7 +16082,7 @@ 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)) @@ -16300,14 +16300,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)); diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 27152d7ba5b..e717389e919 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,19 +96,19 @@ 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); } @@ -118,7 +118,7 @@ inline void CreatureUnitRelocationWorker(Creature* c, Unit* u) 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); @@ -176,7 +176,7 @@ void CreatureRelocationNotifier::Visit(CreatureMapType &m) 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,8 +325,8 @@ 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); } } diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index e310b72158e..f9d179795bc 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -110,7 +110,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); } @@ -242,8 +242,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) @@ -251,16 +251,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) @@ -268,8 +268,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) @@ -277,8 +277,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()); } template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {} @@ -341,8 +341,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> &) {} @@ -465,8 +465,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> &) {} @@ -532,8 +532,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> &) {} @@ -552,8 +552,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> &) {} @@ -846,7 +846,7 @@ namespace Trinity && !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; @@ -931,7 +931,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; @@ -1065,7 +1065,7 @@ namespace Trinity if (!me->IsWithinDistInMap(u, m_range)) return false; - if (!me->canSeeOrDetect(u)) + if (!me->CanSeeOrDetect(u)) return false; if (m_force) @@ -1073,7 +1073,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 @@ -1308,7 +1308,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 40b2df3706b..deb8fa49a6c 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; } } @@ -173,11 +173,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(); } } @@ -189,11 +189,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(); } } @@ -205,11 +205,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(); } } @@ -221,11 +221,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(); } } @@ -237,11 +237,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(); } } @@ -252,8 +252,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> @@ -263,8 +263,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> @@ -274,8 +274,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> @@ -285,8 +285,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> @@ -296,8 +296,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()); } // Gameobject searchers @@ -311,12 +311,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; } } @@ -327,11 +327,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(); } } @@ -339,9 +339,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 @@ -355,12 +355,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; } } @@ -375,12 +375,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; } } @@ -391,11 +391,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(); } } @@ -404,11 +404,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(); } } @@ -416,18 +416,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 @@ -441,12 +441,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; } } @@ -457,11 +457,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(); } } @@ -469,18 +469,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> @@ -492,12 +492,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; } } @@ -508,11 +508,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 1b32ed78b7b..dacb72d5de6 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -35,7 +35,7 @@ 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"); @@ -193,7 +193,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(); @@ -212,13 +212,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(); } } } @@ -227,7 +227,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 80b20180673..f43e49a3440 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -443,10 +443,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)) { @@ -926,7 +926,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)) @@ -1010,7 +1010,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; @@ -1070,7 +1070,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; @@ -1145,7 +1145,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; @@ -1206,7 +1206,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; @@ -1221,7 +1221,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); } @@ -1541,7 +1541,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); } @@ -1551,7 +1551,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; @@ -1564,7 +1564,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); @@ -1770,7 +1770,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; @@ -1788,7 +1788,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; @@ -1854,7 +1854,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; @@ -1878,7 +1878,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; @@ -1891,7 +1891,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) @@ -2066,7 +2066,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; } @@ -2334,7 +2334,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 7b0e5e6d997..db96c50347c 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -216,7 +216,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 @@ -712,7 +712,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 7ccbffee7f2..415b67467c0 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -977,7 +977,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)) @@ -1007,7 +1007,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(); diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 5463b26b74d..4ebccc5bdef 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -125,7 +125,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) else { // send in universal language if player in .gmon mode (ignore spell effects) - if (sender->isGameMaster()) + if (sender->IsGameMaster()) lang = LANG_UNIVERSAL; else { @@ -269,7 +269,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; @@ -281,7 +281,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; diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 623b81e6a0e..c00def4397c 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -84,14 +84,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; diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 2fa51794821..90c1bc4599f 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -765,16 +765,16 @@ void WorldSession::SendListInventory(uint64 vendorGuid) { if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(item->item)) { - if (!(itemTemplate->AllowableClass & _player->getClassMask()) && itemTemplate->Bonding == BIND_WHEN_PICKED_UP && !_player->isGameMaster()) + if (!(itemTemplate->AllowableClass & _player->getClassMask()) && itemTemplate->Bonding == BIND_WHEN_PICKED_UP && !_player->IsGameMaster()) continue; // Only display items in vendor lists for the team the // player is on. If GM on, display all items. - if (!_player->isGameMaster() && ((itemTemplate->Flags2 & ITEM_FLAGS_EXTRA_HORDE_ONLY && _player->GetTeam() == ALLIANCE) || (itemTemplate->Flags2 == ITEM_FLAGS_EXTRA_ALLIANCE_ONLY && _player->GetTeam() == HORDE))) + if (!_player->IsGameMaster() && ((itemTemplate->Flags2 & ITEM_FLAGS_EXTRA_HORDE_ONLY && _player->GetTeam() == ALLIANCE) || (itemTemplate->Flags2 == ITEM_FLAGS_EXTRA_ALLIANCE_ONLY && _player->GetTeam() == HORDE))) continue; // Items sold out are not displayed in list uint32 leftInStock = !item->maxcount ? 0xFFFFFFFF : vendor->GetVendorItemCurrentCount(item); - if (!_player->isGameMaster() && !leftInStock) + if (!_player->IsGameMaster() && !leftInStock) continue; ConditionList conditions = sConditionMgr->GetConditionsForNpcVendorEvent(vendor->GetEntry(), item->item); diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 4885fa38bb5..d289d0f65b8 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -244,7 +244,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 ccd936af4d4..cdcf4c53dd3 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -171,7 +171,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; diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 6005174748f..2bec62f026d 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -105,7 +105,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) uint32 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 34db0782c57..e8d781a8f60 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1181,7 +1181,7 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recvData) WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points); data.append(player->GetPackGUID()); - if (sWorld->getBoolConfig(CONFIG_TALENTS_INSPECTING) || _player->isGameMaster()) + if (sWorld->getBoolConfig(CONFIG_TALENTS_INSPECTING) || _player->IsGameMaster()) player->BuildPlayerTalentsInfoData(&data); else { @@ -1480,7 +1480,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; @@ -1538,7 +1538,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; diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index a90005cf6d1..e3921eec02f 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -690,10 +690,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); @@ -821,10 +821,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); diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index b6a1b462de3..9d210201730 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -449,7 +449,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; diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index a63192f64b6..ee130728106 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; @@ -546,7 +546,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/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 11b795d3c39..c8b57c9924e 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -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, 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); } @@ -453,7 +453,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()) { diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 5765d64ce60..d04a7efa2a8 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 3addb2442e7..11ed92b9d5b 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; @@ -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); @@ -2179,7 +2179,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; } @@ -2187,7 +2187,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 @@ -2206,7 +2206,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) && @@ -2320,7 +2320,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 @@ -2334,7 +2334,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); @@ -2348,9 +2348,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 { @@ -2562,14 +2562,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 @@ -2603,7 +2603,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()); @@ -2636,7 +2636,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) @@ -2752,7 +2752,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 67d8cdb8421..60ebd3f8699 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[player->GetSession()->GetSessionDbcLocale()]; 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/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/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index b5e22f011a1..c30a9a28fab 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -450,7 +450,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 f30c0595f45..55a0736d16e 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1544,7 +1544,7 @@ void AuraEffect::HandlePhase(AuraApplication const* aurApp, uint8 mode, bool app newPhase = PHASEMASK_NORMAL; // GM-mode have mask 0xFFFFFFFF - if (player->isGameMaster()) + if (player->IsGameMaster()) newPhase = 0xFFFFFFFF; player->SetPhaseMask(newPhase, false); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 682b6e09d15..a26c0356907 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4957,7 +4957,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_NOT_IN_ARENA; // 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); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index f3768557af6..31b3dac9643 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1655,7 +1655,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) @@ -1952,7 +1952,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()); @@ -4256,7 +4256,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; diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 231020bb662..5225ff77e95 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1482,7 +1482,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(); @@ -1582,7 +1582,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 5844a120e47..06989544f55 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -377,8 +377,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: @@ -386,16 +386,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: @@ -403,7 +403,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; } |