diff options
author | Malcrom <malcromdev@gmail.com> | 2013-06-11 22:02:00 -0230 |
---|---|---|
committer | Malcrom <malcromdev@gmail.com> | 2013-06-11 22:02:00 -0230 |
commit | 4096c54efaf85343fb4265ebcd7a62b69ca15300 (patch) | |
tree | 7d032b32577228000915680733847b027019082e /src | |
parent | ec474a62e562b3264cc05346fe4c9a1d4f969645 (diff) |
Core: More Function name updates
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Combat/HostileRefManager.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 24 | ||||
-rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 2 | ||||
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp index eb389405c80..4cd76b4e7a2 100644 --- a/src/server/game/Combat/HostileRefManager.cpp +++ b/src/server/game/Combat/HostileRefManager.cpp @@ -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; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 54d309bfceb..3076ce8b4ab 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -690,8 +690,8 @@ void Object::_BuildValuesUpdate(uint8 updateType, ByteBuffer* data, UpdateMask* { if (unit->IsControlledByPlayer() && target != this && sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && unit->IsInRaidWith(target)) { - FactionTemplateEntry const* ft1 = unit->getFactionTemplateEntry(); - FactionTemplateEntry const* ft2 = target->getFactionTemplateEntry(); + FactionTemplateEntry const* ft1 = unit->GetFactionTemplateEntry(); + FactionTemplateEntry const* ft2 = target->GetFactionTemplateEntry(); if (ft1 && ft2 && !ft1->IsFriendlyTo(*ft2)) { if (index == UNIT_FIELD_BYTES_2) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 0e91b618b6f..df1f4c39643 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23111,7 +23111,7 @@ bool Player::GetBGAccessByLevel(BattlegroundTypeId bgTypeId) const float Player::GetReputationPriceDiscount(Creature const* creature) const { - FactionTemplateEntry const* vendor_faction = creature->getFactionTemplateEntry(); + FactionTemplateEntry const* vendor_faction = creature->GetFactionTemplateEntry(); if (!vendor_faction || !vendor_faction->faction) return 1.0f; @@ -24066,7 +24066,7 @@ bool Player::CanUseBattlegroundObject(GameObject* gameobject) // It is possible to call this method with a null pointer, only skipping faction check. if (gameobject) { - FactionTemplateEntry const* playerFaction = getFactionTemplateEntry(); + FactionTemplateEntry const* playerFaction = GetFactionTemplateEntry(); FactionTemplateEntry const* faction = sFactionTemplateStore.LookupEntry(gameobject->GetUInt32Value(GAMEOBJECT_FACTION)); if (playerFaction && faction && !playerFaction->IsFriendlyTo(*faction)) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 49e1bb5ef79..c10bffbbe92 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8727,7 +8727,7 @@ void Unit::setPowerType(Powers new_powertype) } } -FactionTemplateEntry const* Unit::getFactionTemplateEntry() const +FactionTemplateEntry const* Unit::GetFactionTemplateEntry() const { FactionTemplateEntry const* entry = sFactionTemplateStore.LookupEntry(getFaction()); if (!entry) @@ -8781,7 +8781,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const if (selfPlayerOwner->IsInRaidWith(targetPlayerOwner)) return REP_FRIENDLY; // return true to allow config option AllowTwoSide.Interaction.Group to work // however client seems to allow mixed group parties, because in 13850 client it works like: - // return GetFactionReactionTo(getFactionTemplateEntry(), target); + // return GetFactionReactionTo(GetFactionTemplateEntry(), target); } // check FFA_PVP @@ -8791,7 +8791,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const if (selfPlayerOwner) { - if (FactionTemplateEntry const* targetFactionTemplateEntry = target->getFactionTemplateEntry()) + if (FactionTemplateEntry const* targetFactionTemplateEntry = target->GetFactionTemplateEntry()) { if (ReputationRank const* repRank = selfPlayerOwner->GetReputationMgr().GetForcedRankIfAny(targetFactionTemplateEntry)) return *repRank; @@ -8818,7 +8818,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const } } // do checks dependant only on our faction - return GetFactionReactionTo(getFactionTemplateEntry(), target); + return GetFactionReactionTo(GetFactionTemplateEntry(), target); } ReputationRank Unit::GetFactionReactionTo(FactionTemplateEntry const* factionTemplateEntry, Unit const* target) @@ -8827,7 +8827,7 @@ ReputationRank Unit::GetFactionReactionTo(FactionTemplateEntry const* factionTem if (!factionTemplateEntry) return REP_NEUTRAL; - FactionTemplateEntry const* targetFactionTemplateEntry = target->getFactionTemplateEntry(); + FactionTemplateEntry const* targetFactionTemplateEntry = target->GetFactionTemplateEntry(); if (!targetFactionTemplateEntry) return REP_NEUTRAL; @@ -8880,7 +8880,7 @@ bool Unit::IsFriendlyTo(Unit const* unit) const bool Unit::IsHostileToPlayers() const { - FactionTemplateEntry const* my_faction = getFactionTemplateEntry(); + FactionTemplateEntry const* my_faction = GetFactionTemplateEntry(); if (!my_faction || !my_faction->faction) return false; @@ -8893,7 +8893,7 @@ bool Unit::IsHostileToPlayers() const bool Unit::IsNeutralToAll() const { - FactionTemplateEntry const* my_faction = getFactionTemplateEntry(); + FactionTemplateEntry const* my_faction = GetFactionTemplateEntry(); if (!my_faction || !my_faction->faction) return true; @@ -11861,7 +11861,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo Player const* player = target->GetTypeId() == TYPEID_PLAYER ? target->ToPlayer() : ToPlayer(); Unit const* creature = target->GetTypeId() == TYPEID_UNIT ? target : this; - if (FactionTemplateEntry const* factionTemplate = creature->getFactionTemplateEntry()) + if (FactionTemplateEntry const* factionTemplate = creature->GetFactionTemplateEntry()) { if (!(player->GetReputationMgr().GetForcedRankIfAny(factionTemplate))) if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionTemplate->faction)) @@ -15956,7 +15956,7 @@ void Unit::RestoreFaction() if (CreatureTemplate const* cinfo = ToCreature()->GetCreatureTemplate()) // normal creature { - FactionTemplateEntry const* faction = getFactionTemplateEntry(); + FactionTemplateEntry const* faction = GetFactionTemplateEntry(); setFaction((faction && faction->friendlyMask & 0x004) ? cinfo->faction_H : cinfo->faction_A); } } @@ -16108,7 +16108,7 @@ void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap) bool Unit::IsContestedGuard() const { - if (FactionTemplateEntry const* entry = getFactionTemplateEntry()) + if (FactionTemplateEntry const* entry = GetFactionTemplateEntry()) return entry->IsContestedGuardFaction(); return false; @@ -17200,7 +17200,7 @@ void Unit::StopAttackFaction(uint32 faction_id) { if (Unit* victim = GetVictim()) { - if (victim->getFactionTemplateEntry()->faction == faction_id) + if (victim->GetFactionTemplateEntry()->faction == faction_id) { AttackStop(); if (IsNonMeleeSpellCasted(false)) @@ -17215,7 +17215,7 @@ void Unit::StopAttackFaction(uint32 faction_id) AttackerSet const& attackers = getAttackers(); for (AttackerSet::const_iterator itr = attackers.begin(); itr != attackers.end();) { - if ((*itr)->getFactionTemplateEntry()->faction == faction_id) + if ((*itr)->GetFactionTemplateEntry()->faction == faction_id) { (*itr)->AttackStop(); itr = attackers.begin(); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 5763bb2eddf..da954fc9e40 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1389,7 +1389,7 @@ class Unit : public WorldObject // faction template id uint32 getFaction() const { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); } void setFaction(uint32 faction) { SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction); } - FactionTemplateEntry const* getFactionTemplateEntry() const; + FactionTemplateEntry const* GetFactionTemplateEntry() const; ReputationRank GetReactionTo(Unit const* target) const; ReputationRank static GetFactionReactionTo(FactionTemplateEntry const* factionTemplateEntry, Unit const* target); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 31b3dac9643..bd27cf27ee0 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5776,7 +5776,7 @@ void Spell::EffectGameObjectDamage(SpellEffIndex /*effIndex*/) if (!caster) return; - FactionTemplateEntry const* casterFaction = caster->getFactionTemplateEntry(); + FactionTemplateEntry const* casterFaction = caster->GetFactionTemplateEntry(); FactionTemplateEntry const* targetFaction = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION)); // Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls/Ulduar Storm Beacons) if ((casterFaction && targetFaction && !casterFaction->IsFriendlyTo(*targetFaction)) || !targetFaction) diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 0e3f0790980..393244c9ac5 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -317,7 +317,7 @@ public: { if (!creature->IsHostileTo(player)) { - if (FactionTemplateEntry const* pFaction = creature->getFactionTemplateEntry()) + if (FactionTemplateEntry const* pFaction = creature->GetFactionTemplateEntry()) { uint32 Spell = 0; |