Core: More Function name updates
This commit is contained in:
1 parent
ec474a62e5
commit
4096c54efa
7 files changed
+20
-20
No files matched your search
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user