diff options
Diffstat (limited to 'src')
94 files changed, 565 insertions, 565 deletions
diff --git a/src/server/game/AI/PlayerAI/PlayerAI.cpp b/src/server/game/AI/PlayerAI/PlayerAI.cpp index e148d34b04b..594ecbb4ec4 100644 --- a/src/server/game/AI/PlayerAI/PlayerAI.cpp +++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp @@ -647,7 +647,7 @@ PlayerAI::TargetedSpell SimpleCharmedPlayerAI::SelectAppropriateCastForSpec() { PossibleSpellVector spells; - switch (me->getClass()) + switch (me->GetClass()) { case CLASS_WARRIOR: if (!me->IsWithinMeleeRange(me->GetVictim())) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index df85fa3bada..d89a1957712 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -818,7 +818,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (e.action.fleeAssist.withEmote) { - Trinity::BroadcastTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, BROADCAST_TEXT_FLEE_FOR_ASSIST, me->getGender()); + Trinity::BroadcastTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, BROADCAST_TEXT_FLEE_FOR_ASSIST, me->GetGender()); sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); } TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_FLEE_FOR_ASSIST: Creature %u DoFleeToGetAssistance", me->GetGUID().GetCounter()); @@ -1059,7 +1059,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u me->CallForHelp(float(e.action.callHelp.range)); if (e.action.callHelp.withEmote) { - Trinity::BroadcastTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, BROADCAST_TEXT_CALL_FOR_HELP, me->getGender()); + Trinity::BroadcastTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, BROADCAST_TEXT_CALL_FOR_HELP, me->GetGender()); sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); } TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_CALL_FOR_HELP: Creature %u", me->GetGUID().GetCounter()); diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 3cf08e834e7..0c3cb6e069b 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -307,17 +307,17 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Wo case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_CLASS_RACE: if (!target || target->GetTypeId() != TYPEID_PLAYER) return false; - if (classRace.class_id && classRace.class_id != target->ToPlayer()->getClass()) + if (classRace.class_id && classRace.class_id != target->ToPlayer()->GetClass()) return false; - if (classRace.race_id && classRace.race_id != target->ToPlayer()->getRace()) + if (classRace.race_id && classRace.race_id != target->ToPlayer()->GetRace()) return false; return true; case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_PLAYER_CLASS_RACE: if (source->GetTypeId() != TYPEID_PLAYER) return false; - if (classRace.class_id && classRace.class_id != source->ToPlayer()->getClass()) + if (classRace.class_id && classRace.class_id != source->ToPlayer()->GetClass()) return false; - if (classRace.race_id && classRace.race_id != source->ToPlayer()->getRace()) + if (classRace.race_id && classRace.race_id != source->ToPlayer()->GetRace()) return false; return true; case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_LESS_HEALTH: @@ -358,7 +358,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Wo Unit const* unitTarget = target->ToUnit(); if (!unitTarget) return false; - return unitTarget->getLevel() >= level.minlevel; + return unitTarget->GetLevel() >= level.minlevel; } case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER: { @@ -367,7 +367,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Wo Unit const* unitTarget = target->ToUnit(); if (!unitTarget) return false; - return unitTarget->getGender() == gender.gender; + return unitTarget->GetGender() == gender.gender; } case ACHIEVEMENT_CRITERIA_DATA_TYPE_SCRIPT: { @@ -621,7 +621,7 @@ void AchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, PreparedQ // title achievement rewards are retroactive if (AchievementReward const* reward = sAchievementMgr->GetAchievementReward(achievement)) - if (uint32 titleId = reward->TitleId[Player::TeamForRace(GetPlayer()->getRace()) == ALLIANCE ? 0 : 1]) + if (uint32 titleId = reward->TitleId[Player::TeamForRace(GetPlayer()->GetRace()) == ALLIANCE ? 0 : 1]) if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) GetPlayer()->SetTitle(titleEntry); @@ -678,7 +678,7 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildId())) { - Trinity::BroadcastTextBuilder _builder(GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, BROADCAST_TEXT_ACHIEVEMENT_EARNED, GetPlayer()->getGender(), GetPlayer(), achievement->ID); + Trinity::BroadcastTextBuilder _builder(GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, BROADCAST_TEXT_ACHIEVEMENT_EARNED, GetPlayer()->GetGender(), GetPlayer(), achievement->ID); Trinity::LocalizedPacketDo<Trinity::BroadcastTextBuilder> _localizer(_builder); guild->BroadcastWorker(_localizer, GetPlayer()); } @@ -703,7 +703,7 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) // if player is in world he can tell his friends about new achievement else if (GetPlayer()->IsInWorld()) { - Trinity::BroadcastTextBuilder _builder(GetPlayer(), CHAT_MSG_ACHIEVEMENT, BROADCAST_TEXT_ACHIEVEMENT_EARNED, GetPlayer()->getGender(), GetPlayer(), achievement->ID); + Trinity::BroadcastTextBuilder _builder(GetPlayer(), CHAT_MSG_ACHIEVEMENT, BROADCAST_TEXT_ACHIEVEMENT_EARNED, GetPlayer()->GetGender(), GetPlayer(), achievement->ID); Trinity::LocalizedPacketDo<Trinity::BroadcastTextBuilder> _localizer(_builder); Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::BroadcastTextBuilder>> _worker(GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), _localizer); Cell::VisitWorldObjects(GetPlayer(), _worker, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY)); @@ -882,7 +882,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // specialized cases case ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL: - SetCriteriaProgress(achievementCriteria, GetPlayer()->getLevel()); + SetCriteriaProgress(achievementCriteria, GetPlayer()->GetLevel()); break; case ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL: if (uint32 skillvalue = GetPlayer()->GetBaseSkillValue(achievementCriteria->Asset.SkillID)) diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index a83ab6e05a9..7f6c3f6074b 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -271,7 +271,7 @@ void Battlefield::InvitePlayerToWar(Player* player) } // If the player does not match minimal level requirements for the battlefield, kick him - if (player->getLevel() < m_MinLevel) + if (player->GetLevel() < m_MinLevel) { if (m_PlayersWillBeKick[player->GetTeamId()].count(player->GetGUID()) == 0) m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = GameTime::GetGameTime() + 10; diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index aa4f2a181e6..90de86b95d3 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -1328,7 +1328,7 @@ void BattlefieldWG::UpdateTenacity() { for (auto itr = m_players[m_tenacityTeam].begin(); itr != m_players[m_tenacityTeam].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) - if (player->getLevel() >= m_MinLevel) + if (player->GetLevel() >= m_MinLevel) player->RemoveAurasDueToSpell(SPELL_TENACITY); for (auto itr = m_vehicles[m_tenacityTeam].begin(); itr != m_vehicles[m_tenacityTeam].end(); ++itr) diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 4b8ba05578d..026c4773bee 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -104,7 +104,7 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid) Player* player = ObjectAccessor::FindPlayer(playerGuid); if (player) { - playerClass = player->getClass(); + playerClass = player->GetClass(); playerName = player->GetName(); } else @@ -446,7 +446,7 @@ void ArenaTeam::Roster(WorldSession* session) data << uint8((player ? 1 : 0)); // online flag data << itr->Name; // member name data << uint32((itr->Guid == GetCaptain() ? 0 : 1)); // captain flag 0 captain 1 member - data << uint8((player ? player->getLevel() : 0)); // unknown, level? + data << uint8((player ? player->GetLevel() : 0)); // unknown, level? data << uint8(itr->Class); // class data << uint32(itr->WeekGames); // played this week data << uint32(itr->WeekWins); // wins this week diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 7e7b4b3e9f8..939fedabc94 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -648,8 +648,8 @@ void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, ObjectGuid uint32 winner_arena = player->GetRandomWinner() ? sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_ARENA_LAST) : sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_ARENA_FIRST); uint32 loser_kills = player->GetRandomWinner() ? sWorld->getIntConfig(CONFIG_BG_REWARD_LOSER_HONOR_LAST) : sWorld->getIntConfig(CONFIG_BG_REWARD_LOSER_HONOR_FIRST); - winner_kills = Trinity::Honor::hk_honor_at_level(player->getLevel(), float(winner_kills)); - loser_kills = Trinity::Honor::hk_honor_at_level(player->getLevel(), float(loser_kills)); + winner_kills = Trinity::Honor::hk_honor_at_level(player->GetLevel(), float(winner_kills)); + loser_kills = Trinity::Honor::hk_honor_at_level(player->GetLevel(), float(loser_kills)); data->Initialize(SMSG_BATTLEFIELD_LIST); *data << uint64(guid); // battlemaster guid @@ -687,7 +687,7 @@ void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, ObjectGuid if (it != bgDataStore.end()) { // expected bracket entry - if (PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(it->second.m_Battlegrounds.begin()->second->GetMapId(), player->getLevel())) + if (PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(it->second.m_Battlegrounds.begin()->second->GetMapId(), player->GetLevel())) { uint32 count = 0; BattlegroundBracketId bracketId = bracketEntry->GetBracketId(); diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 7b2278db96f..1b55e9aaeec 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -443,7 +443,7 @@ void CalendarMgr::SendCalendarEventInvite(CalendarInvite const& invite) ObjectGuid invitee = invite.GetInviteeGUID(); Player* player = ObjectAccessor::FindConnectedPlayer(invitee); - uint8 level = player ? player->getLevel() : sCharacterCache->GetCharacterLevelByGuid(invitee); + uint8 level = player ? player->GetLevel() : sCharacterCache->GetCharacterLevelByGuid(invitee); WorldPacket data(SMSG_CALENDAR_EVENT_INVITE, 8 + 8 + 8 + 1 + 1 + 1 + (4) + 1); data << invitee.WriteAsPacked(); @@ -589,7 +589,7 @@ void CalendarMgr::SendCalendarEvent(ObjectGuid guid, CalendarEvent const& calend ObjectGuid inviteeGuid = calendarInvite->GetInviteeGUID(); Player* invitee = ObjectAccessor::FindPlayer(inviteeGuid); - uint8 inviteeLevel = invitee ? invitee->getLevel() : sCharacterCache->GetCharacterLevelByGuid(inviteeGuid); + uint8 inviteeLevel = invitee ? invitee->GetLevel() : sCharacterCache->GetCharacterLevelByGuid(inviteeGuid); ObjectGuid::LowType inviteeGuildId = invitee ? invitee->GetGuildId() : sCharacterCache->GetCharacterGuildIdByGuid(inviteeGuid); data << inviteeGuid.WriteAsPacked(); diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index ee4feff9d61..715979defd3 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -187,19 +187,19 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const case CONDITION_CLASS: { if (Unit* unit = object->ToUnit()) - condMeets = (unit->getClassMask() & ConditionValue1) != 0; + condMeets = (unit->GetClassMask() & ConditionValue1) != 0; break; } case CONDITION_RACE: { if (Unit* unit = object->ToUnit()) - condMeets = (unit->getRaceMask() & ConditionValue1) != 0; + condMeets = (unit->GetRaceMask() & ConditionValue1) != 0; break; } case CONDITION_GENDER: { if (Player* player = object->ToPlayer()) - condMeets = player->getGender() == ConditionValue1; + condMeets = player->GetGender() == ConditionValue1; break; } case CONDITION_SKILL: @@ -285,7 +285,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const case CONDITION_LEVEL: { if (Unit* unit = object->ToUnit()) - condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue2), static_cast<uint32>(unit->getLevel()), ConditionValue1); + condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue2), static_cast<uint32>(unit->GetLevel()), ConditionValue1); break; } case CONDITION_DRUNKENSTATE: diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index d26ccd5b106..61c8753bf8a 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1468,7 +1468,7 @@ void LFGMgr::FinishDungeon(ObjectGuid gguid, const uint32 dungeonId, Map const* player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS, lfdRandomPlayers); } - LfgReward const* reward = GetRandomDungeonReward(rDungeonId, player->getLevel()); + LfgReward const* reward = GetRandomDungeonReward(rDungeonId, player->GetLevel()); if (!reward) continue; @@ -1645,7 +1645,7 @@ LfgLockMap const LFGMgr::GetLockedDungeons(ObjectGuid guid) return lock; } - uint8 level = player->getLevel(); + uint8 level = player->GetLevel(); uint8 expansion = player->GetSession()->Expansion(); LfgDungeonSet const& dungeons = GetDungeonsByRandom(0); bool denyJoin = !player->GetSession()->HasPermission(rbac::RBAC_PERM_JOIN_DUNGEON_FINDER); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index bb6c9e19aab..aa32fc90f76 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1193,7 +1193,7 @@ bool Creature::CanResetTalents(Player* player, bool pet) const if (!trainer) return false; - return player->getLevel() >= 10 && + return player->GetLevel() >= 10 && (trainer->GetTrainerType() == (pet ? Trainer::Type::Pet : Trainer::Type::Class)) && trainer->IsTrainerValidForPlayer(player); } @@ -1382,7 +1382,7 @@ void Creature::UpdateLevelDependantStats() { CreatureTemplate const* cInfo = GetCreatureTemplate(); uint32 rank = IsPet() ? 0 : cInfo->rank; - CreatureBaseStats const* stats = sObjectMgr->GetCreatureBaseStats(getLevel(), cInfo->unit_class); + CreatureBaseStats const* stats = sObjectMgr->GetCreatureBaseStats(GetLevel(), cInfo->unit_class); // health float healthmod = _GetHealthMod(rank); @@ -1399,7 +1399,7 @@ void Creature::UpdateLevelDependantStats() uint32 mana = stats->GenerateMana(cInfo); SetCreateMana(mana); - switch (getClass()) + switch (GetClass()) { case UNIT_CLASS_PALADIN: case UNIT_CLASS_MAGE: @@ -1825,7 +1825,7 @@ bool Creature::CanStartAttack(Unit const* who, bool force) const return false; // No aggro from gray creatures - if (CheckNoGrayAggroConfig(who->getLevelForTarget(this), getLevelForTarget(who))) + if (CheckNoGrayAggroConfig(who->GetLevelForTarget(this), GetLevelForTarget(who))) return false; return IsWithinLOSInMap(who); @@ -1853,8 +1853,8 @@ float Creature::GetAttackDistance(Unit const* player) const if (aggroRate == 0) return 0.0f; - uint32 playerlevel = player->getLevelForTarget(this); - uint32 creaturelevel = getLevelForTarget(player); + uint32 playerlevel = player->GetLevelForTarget(this); + uint32 creaturelevel = GetLevelForTarget(player); int32 leveldif = int32(playerlevel) - int32(creaturelevel); @@ -2538,7 +2538,7 @@ void Creature::SendZoneUnderAttackMessage(Player* attacker) uint32 Creature::GetShieldBlockValue() const //dunno mob block value { - return (getLevel()/2 + uint32(GetStat(STAT_STRENGTH)/20)); + return (GetLevel()/2 + uint32(GetStat(STAT_STRENGTH)/20)); } bool Creature::HasSpell(uint32 spellID) const @@ -2660,12 +2660,12 @@ void Creature::AllLootRemovedFromCorpse() m_respawnTime = std::max<time_t>(m_corpseRemoveTime + m_respawnDelay, m_respawnTime); } -uint8 Creature::getLevelForTarget(WorldObject const* target) const +uint8 Creature::GetLevelForTarget(WorldObject const* target) const { if (!isWorldBoss() || !target->ToUnit()) - return Unit::getLevelForTarget(target); + return Unit::GetLevelForTarget(target); - uint16 level = target->ToUnit()->getLevel() + sWorld->getIntConfig(CONFIG_WORLD_BOSS_LEVEL_DIFF); + uint16 level = target->ToUnit()->GetLevel() + sWorld->getIntConfig(CONFIG_WORLD_BOSS_LEVEL_DIFF); if (level < 1) return 1; if (level > 255) @@ -2920,11 +2920,11 @@ float Creature::GetAggroRange(Unit const* target) const uint32 targetLevel = 0; if (target->GetTypeId() == TYPEID_PLAYER) - targetLevel = target->getLevelForTarget(this); + targetLevel = target->GetLevelForTarget(this); else if (target->GetTypeId() == TYPEID_UNIT) - targetLevel = target->ToCreature()->getLevelForTarget(this); + targetLevel = target->ToCreature()->GetLevelForTarget(this); - uint32 myLevel = getLevelForTarget(target); + uint32 myLevel = GetLevelForTarget(target); int32 levelDiff = int32(targetLevel) - int32(myLevel); // The maximum Aggro Radius is capped at 45 yards (25 level difference) diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 5246e2c6284..83268df8303 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -134,7 +134,7 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma bool isElite() const; bool isWorldBoss() const; - uint8 getLevelForTarget(WorldObject const* target) const override; // overwrite Unit::getLevelForTarget for boss level support + uint8 GetLevelForTarget(WorldObject const* target) const override; // overwrite Unit::GetLevelForTarget for boss level support bool IsInEvadeMode() const { return HasUnitState(UNIT_STATE_EVADE); } bool IsEvadingAttacks() const { return IsInEvadeMode() || CanNotReachTarget(); } diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 5572ff22f4a..9c77f739944 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -189,7 +189,7 @@ void TempSummon::InitStats(uint32 duration) if (owner && IsTrigger() && m_spells[0]) { SetFaction(owner->GetFaction()); - SetLevel(owner->getLevel()); + SetLevel(owner->GetLevel()); if (owner->GetTypeId() == TYPEID_PLAYER) m_ControlledByPlayer = true; } @@ -389,7 +389,7 @@ void Guardian::InitStats(uint32 duration) { Minion::InitStats(duration); - InitStatsForLevel(GetOwner()->getLevel()); + InitStatsForLevel(GetOwner()->GetLevel()); if (GetOwner()->GetTypeId() == TYPEID_PLAYER && HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) m_charmInfo->InitCharmCreateSpells(); @@ -426,7 +426,7 @@ Puppet::Puppet(SummonPropertiesEntry const* properties, Unit* owner) void Puppet::InitStats(uint32 duration) { Minion::InitStats(duration); - SetLevel(GetOwner()->getLevel()); + SetLevel(GetOwner()->GetLevel()); SetReactState(REACT_PASSIVE); } diff --git a/src/server/game/Entities/Creature/Trainer.cpp b/src/server/game/Entities/Creature/Trainer.cpp index 83fbde25396..e51103c74cb 100644 --- a/src/server/game/Entities/Creature/Trainer.cpp +++ b/src/server/game/Entities/Creature/Trainer.cpp @@ -169,7 +169,7 @@ namespace Trainer return SpellState::Unavailable; // check level requirement - if (player->getLevel() < trainerSpell->ReqLevel) + if (player->GetLevel() < trainerSpell->ReqLevel) return SpellState::Unavailable; // check ranks @@ -217,10 +217,10 @@ namespace Trainer case Type::Class: case Type::Pet: // check class for class trainers - return player->getClass() == GetTrainerRequirement(); + return player->GetClass() == GetTrainerRequirement(); case Type::Mount: // check race for mount trainers - return player->getRace() == GetTrainerRequirement(); + return player->GetRace() == GetTrainerRequirement(); case Type::Tradeskill: // check spell for profession trainers return player->HasSpell(GetTrainerRequirement()); diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 04146d451a5..2212267b179 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1277,10 +1277,10 @@ bool GameObject::IsInvisibleDueToDespawn() const return false; } -uint8 GameObject::getLevelForTarget(WorldObject const* target) const +uint8 GameObject::GetLevelForTarget(WorldObject const* target) const { if (Unit* owner = GetOwner()) - return owner->getLevelForTarget(target); + return owner->GetLevelForTarget(target); return 1; } @@ -1902,10 +1902,10 @@ void GameObject::Use(Unit* user) return; //required lvl checks! - uint8 level = player->getLevel(); + uint8 level = player->GetLevel(); if (level < info->meetingstone.minLevel) return; - level = targetPlayer->getLevel(); + level = targetPlayer->GetLevel(); if (level < info->meetingstone.minLevel) return; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 5059d58fe09..f47611cee9f 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -233,7 +233,7 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject> bool IsAlwaysVisibleFor(WorldObject const* seer) const override; bool IsInvisibleDueToDespawn() const override; - uint8 getLevelForTarget(WorldObject const* target) const override; + uint8 GetLevelForTarget(WorldObject const* target) const override; GameObject* LookupFishingHoleAround(float range); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 8330c861140..cef6b44ede9 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1709,13 +1709,13 @@ bool WorldObject::CanDetectStealthOf(WorldObject const* obj, bool checkAlert) co // Level difference: 5 point / level, starting from level 1. // There may be spells for this and the starting points too, but // not in the DBCs of the client. - detectionValue += int32(getLevelForTarget(obj) - 1) * 5; + detectionValue += int32(GetLevelForTarget(obj) - 1) * 5; // Apply modifiers detectionValue += m_stealthDetect.GetValue(StealthType(i)); if (go) if (Unit* owner = go->GetOwner()) - detectionValue -= int32(owner->getLevelForTarget(this) - 1) * 5; + detectionValue -= int32(owner->GetLevelForTarget(this) - 1) * 5; detectionValue -= obj->m_stealth.GetValue(StealthType(i)); @@ -2043,7 +2043,7 @@ Creature* WorldObject::SummonTrigger(float x, float y, float z, float ang, uint3 if (GetTypeId() == TYPEID_PLAYER || GetTypeId() == TYPEID_UNIT) { summon->SetFaction(((Unit*)this)->GetFaction()); - summon->SetLevel(((Unit*)this)->getLevel()); + summon->SetLevel(((Unit*)this)->GetLevel()); } if (GetAI) @@ -2417,10 +2417,10 @@ SpellMissInfo WorldObject::MagicSpellHitResult(Unit* victim, SpellInfo const* sp SpellSchoolMask schoolMask = spellInfo->GetSchoolMask(); // PvP - PvE spell misschances per leveldif > 2 int32 lchance = victim->GetTypeId() == TYPEID_PLAYER ? 7 : 11; - int32 thisLevel = getLevelForTarget(victim); + int32 thisLevel = GetLevelForTarget(victim); if (GetTypeId() == TYPEID_UNIT && ToCreature()->IsTrigger()) thisLevel = std::max<int32>(thisLevel, spellInfo->SpellLevel); - int32 leveldif = int32(victim->getLevelForTarget(this)) - thisLevel; + int32 leveldif = int32(victim->GetLevelForTarget(this)) - thisLevel; // Base hit chance from attacker and victim levels int32 modHitChance; diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 7df4a119436..ed49c7ba121 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -362,7 +362,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation virtual void SendMessageToSetInRange(WorldPacket const* data, float dist, bool self) const; virtual void SendMessageToSet(WorldPacket const* data, Player const* skipped_rcvr) const; - virtual uint8 getLevelForTarget(WorldObject const* /*target*/) const { return 1; } + virtual uint8 GetLevelForTarget(WorldObject const* /*target*/) const { return 1; } void PlayDistanceSound(uint32 sound_id, Player* target = nullptr); void PlayDirectSound(uint32 sound_id, Player* target = nullptr); diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 5888120acf6..d29ae0e51af 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -217,7 +217,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c switch (getPetType()) { case SUMMON_PET: - petlevel = owner->getLevel(); + petlevel = owner->GetLevel(); SetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_CLASS, uint8(CLASS_MAGE)); SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); @@ -460,7 +460,7 @@ void Pet::SavePetToDB(PetSaveMode mode) stmt->setUInt32(1, GetEntry()); stmt->setUInt32(2, ownerLowGUID); stmt->setUInt32(3, GetNativeDisplayId()); - stmt->setUInt8(4, getLevel()); + stmt->setUInt8(4, GetLevel()); stmt->setUInt32(5, GetUInt32Value(UNIT_FIELD_PETEXPERIENCE)); stmt->setUInt8(6, GetReactState()); stmt->setUInt8(7, mode); @@ -678,8 +678,8 @@ void Pet::GivePetXP(uint32 xp) if (!IsAlive()) return; - uint8 maxlevel = std::min((uint8)sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL), GetOwner()->getLevel()); - uint8 petlevel = getLevel(); + uint8 maxlevel = std::min((uint8)sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL), GetOwner()->GetLevel()); + uint8 petlevel = GetLevel(); // If pet is detected to be at, or above(?) the players level, don't hand out XP if (petlevel >= maxlevel) @@ -706,7 +706,7 @@ void Pet::GivePetXP(uint32 xp) void Pet::GivePetLevel(uint8 level) { - if (!level || level == getLevel()) + if (!level || level == GetLevel()) return; if (getPetType() == HUNTER_PET) @@ -778,7 +778,7 @@ bool Pet::CreateBaseAtTamed(CreatureTemplate const* cinfo, Map* map, uint32 phas SetPower(POWER_HAPPINESS, 166500); SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, 0); SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0); - SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, uint32(sObjectMgr->GetXPForLevel(getLevel()+1)*PET_XP_FACTOR)); + SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, uint32(sObjectMgr->GetXPForLevel(GetLevel()+1)*PET_XP_FACTOR)); SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE); if (cinfo->type == CREATURE_TYPE_BEAST) @@ -804,13 +804,13 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) PetType petType = MAX_PET_TYPE; if (IsPet() && GetOwner()->GetTypeId() == TYPEID_PLAYER) { - if (GetOwner()->getClass() == CLASS_WARLOCK - || GetOwner()->getClass() == CLASS_SHAMAN // Fire Elemental - || GetOwner()->getClass() == CLASS_DEATH_KNIGHT) // Risen Ghoul + if (GetOwner()->GetClass() == CLASS_WARLOCK + || GetOwner()->GetClass() == CLASS_SHAMAN // Fire Elemental + || GetOwner()->GetClass() == CLASS_DEATH_KNIGHT) // Risen Ghoul { petType = SUMMON_PET; } - else if (GetOwner()->getClass() == CLASS_HUNTER) + else if (GetOwner()->GetClass() == CLASS_HUNTER) { petType = HUNTER_PET; m_unitTypeMask |= UNIT_MASK_HUNTER_PET; @@ -818,7 +818,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) else { TC_LOG_ERROR("entities.pet", "Unknown type pet %u is summoned by player class %u", - GetEntry(), GetOwner()->getClass()); + GetEntry(), GetOwner()->GetClass()); } } @@ -839,12 +839,12 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) if (cFamily && cFamily->minScale > 0.0f && petType == HUNTER_PET) { float scale; - if (getLevel() >= cFamily->maxScaleLevel) + if (GetLevel() >= cFamily->maxScaleLevel) scale = cFamily->maxScale; - else if (getLevel() <= cFamily->minScaleLevel) + else if (GetLevel() <= cFamily->minScaleLevel) scale = cFamily->minScale; else - scale = cFamily->minScale + float(getLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale); + scale = cFamily->minScale + float(GetLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale); SetObjectScale(scale); } @@ -1076,13 +1076,13 @@ bool Pet::HaveInDiet(ItemTemplate const* item) const uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel) const { // -5 or greater food level - if (getLevel() <= itemlevel + 5) //possible to feed level 60 pet with level 55 level food for full effect + if (GetLevel() <= itemlevel + 5) //possible to feed level 60 pet with level 55 level food for full effect return 35000; // -10..-6 - else if (getLevel() <= itemlevel + 10) //pure guess, but sounds good + else if (GetLevel() <= itemlevel + 10) //pure guess, but sounds good return 17000; // -14..-11 - else if (getLevel() <= itemlevel + 14) //level 55 food gets green on 70, makes sense to me + else if (GetLevel() <= itemlevel + 14) //level 55 food gets green on 70, makes sense to me return 8000; // -15 or less else @@ -1431,7 +1431,7 @@ bool Pet::addSpell(uint32 spellId, ActiveStates active /*= ACT_DECIDE*/, PetSpel uint32 talentCost = GetTalentSpellCost(spellId); if (talentCost) { - int32 free_points = GetMaxTalentPointsForLevel(getLevel()); + int32 free_points = GetMaxTalentPointsForLevel(GetLevel()); m_usedTalentCount += talentCost; // update free talent points free_points -= m_usedTalentCount; @@ -1458,7 +1458,7 @@ bool Pet::learnSpell(uint32 spell_id) void Pet::InitLevelupSpellsForLevel() { - uint8 level = getLevel(); + uint8 level = GetLevel(); if (PetLevelupSpellSet const* levelupSpells = GetCreatureTemplate()->family ? sSpellMgr->GetPetLevelupSpellList(GetCreatureTemplate()->family) : nullptr) { @@ -1534,7 +1534,7 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab) else m_usedTalentCount = 0; // update free talent points - int32 free_points = GetMaxTalentPointsForLevel(getLevel()) - m_usedTalentCount; + int32 free_points = GetMaxTalentPointsForLevel(GetLevel()) - m_usedTalentCount; SetFreeTalentPoints(free_points > 0 ? free_points : 0); } @@ -1599,7 +1599,7 @@ bool Pet::resetTalents() if (!pet_family || pet_family->petTalentType < 0) return false; - uint8 level = getLevel(); + uint8 level = GetLevel(); uint32 talentPointsForLevel = GetMaxTalentPointsForLevel(level); if (m_usedTalentCount == 0) @@ -1735,7 +1735,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* onlinePet /*= nullptr*/) void Pet::InitTalentForLevel() { - uint8 level = getLevel(); + uint8 level = GetLevel(); uint32 talentPointsForLevel = GetMaxTalentPointsForLevel(level); // Reset talents in case low level (on level down) or wrong points for level (hunter can unlearn TP increase talent) if (talentPointsForLevel == 0 || m_usedTalentCount > talentPointsForLevel) @@ -1809,7 +1809,7 @@ bool Pet::IsPermanentPetFor(Player* owner) const switch (getPetType()) { case SUMMON_PET: - switch (owner->getClass()) + switch (owner->GetClass()) { case CLASS_WARLOCK: return GetCreatureTemplate()->type == CREATURE_TYPE_DEMON; @@ -1939,14 +1939,14 @@ void Pet::SynchronizeLevelWithOwner() { // always same level case SUMMON_PET: - GivePetLevel(owner->getLevel()); + GivePetLevel(owner->GetLevel()); break; // can't be greater owner level case HUNTER_PET: - if (getLevel() > owner->getLevel()) - GivePetLevel(owner->getLevel()); - else if (getLevel() + 5 < owner->getLevel()) - GivePetLevel(owner->getLevel() - 5); + if (GetLevel() > owner->GetLevel()) + GivePetLevel(owner->GetLevel()); + else if (GetLevel() + 5 < owner->GetLevel()) + GivePetLevel(owner->GetLevel() - 5); break; default: break; diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp index 6430a345a96..931806bd935 100644 --- a/src/server/game/Entities/Player/KillRewarder.cpp +++ b/src/server/game/Entities/Player/KillRewarder.cpp @@ -92,7 +92,7 @@ inline void KillRewarder::_InitGroupData() if (Player* member = itr->GetSource()) if (_killer == member || (member->IsAtGroupRewardDistance(_victim) && member->IsAlive())) { - const uint8 lvl = member->getLevel(); + const uint8 lvl = member->GetLevel(); // 2.1. _count - number of alive group members within reward distance; ++_count; // 2.2. _sumLevel - sum of levels of alive group members within reward distance; @@ -103,12 +103,12 @@ inline void KillRewarder::_InitGroupData() // 2.4. _maxNotGrayMember - maximum level of alive group member within reward distance, // for whom victim is not gray; uint32 grayLevel = Trinity::XP::GetGrayLevel(lvl); - if (_victim->getLevel() > grayLevel && (!_maxNotGrayMember || _maxNotGrayMember->getLevel() < lvl)) + if (_victim->GetLevel() > grayLevel && (!_maxNotGrayMember || _maxNotGrayMember->GetLevel() < lvl)) _maxNotGrayMember = member; } // 2.5. _isFullXP - flag identifying that for all group members victim is not gray, // so 100% XP will be rewarded (50% otherwise). - _isFullXP = _maxNotGrayMember && (_maxLevel == _maxNotGrayMember->getLevel()); + _isFullXP = _maxNotGrayMember && (_maxLevel == _maxNotGrayMember->GetLevel()); } else _count = 1; @@ -141,7 +141,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate) // * set to 0 if player's level is more than maximum level of not gray member; // * cut XP in half if _isFullXP is false. if (_maxNotGrayMember && player->IsAlive() && - _maxNotGrayMember->getLevel() >= player->getLevel()) + _maxNotGrayMember->GetLevel() >= player->GetLevel()) xp = _isFullXP ? uint32(xp * rate) : // Reward FULL XP if all group members are not gray. uint32(xp * rate / 2) + 1; // Reward only HALF of XP if some of group members are gray. @@ -195,7 +195,7 @@ void KillRewarder::_RewardPlayer(Player* player, bool isDungeon) if (!_isPvP || _isBattleGround) { float const rate = _group ? - _groupRate * float(player->getLevel()) / _sumLevel : // Group rate depends on summary level. + _groupRate * float(player->GetLevel()) / _sumLevel : // Group rate depends on summary level. 1.0f; // Personal rate is 100%. if (_xp) // 4.2. Give XP. diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5d8e814a566..e8fc8c3d5dd 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -550,7 +550,7 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0); // set starting level - uint32 start_level = getClass() != CLASS_DEATH_KNIGHT + uint32 start_level = GetClass() != CLASS_DEATH_KNIGHT ? sWorld->getIntConfig(CONFIG_START_PLAYER_LEVEL) : sWorld->getIntConfig(CONFIG_START_DEATH_KNIGHT_PLAYER_LEVEL); @@ -618,7 +618,7 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo switch (iProto->Spells[0].SpellCategory) { case SPELL_CATEGORY_FOOD: // food - count = getClass() == CLASS_DEATH_KNIGHT ? 10 : 4; + count = GetClass() == CLASS_DEATH_KNIGHT ? 10 : 4; break; case SPELL_CATEGORY_DRINK: // drink count = 2; @@ -707,7 +707,7 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) // item can't be added TC_LOG_ERROR("entities.player.items", "Player::StoreNewItemInBestSlots: Player '%s' (%s) can't equip or store initial item (ItemID: %u, Race: %u, Class: %u, InventoryResult: %u)", - GetName().c_str(), GetGUID().ToString().c_str(), titem_id, getRace(), getClass(), msg); + GetName().c_str(), GetGUID().ToString().c_str(), titem_id, GetRace(), GetClass(), msg); return false; } @@ -865,7 +865,7 @@ void Player::HandleDrowning(uint32 time_diff) m_MirrorTimer[BREATH_TIMER] += 1 * IN_MILLISECONDS; // Calculate and deal damage /// @todo Check this formula - uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel() - 1); + uint32 damage = GetMaxHealth() / 5 + urand(0, GetLevel() - 1); EnvironmentalDamage(DAMAGE_DROWNING, damage); } else if (!(m_MirrorTimerFlagsLast & UNDERWATER_INWATER)) // Update time in client if need @@ -901,7 +901,7 @@ void Player::HandleDrowning(uint32 time_diff) m_MirrorTimer[FATIGUE_TIMER] += 1 * IN_MILLISECONDS; if (IsAlive()) // Calculate and deal damage { - uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel() - 1); + uint32 damage = GetMaxHealth() / 5 + urand(0, GetLevel() - 1); EnvironmentalDamage(DAMAGE_EXHAUSTED, damage); } else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) // Teleport ghost to graveyard @@ -1310,7 +1310,7 @@ void Player::Update(uint32 p_time) } } - if (getClass() == CLASS_DEATH_KNIGHT) + if (GetClass() == CLASS_DEATH_KNIGHT) { // Update rune timers for (uint8 i = 0; i < MAX_RUNES; ++i) @@ -1724,7 +1724,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 @@ -1990,7 +1990,7 @@ void Player::RegenerateAll() Regenerate(POWER_MANA); // Runes act as cooldowns, and they don't need to send any data - if (getClass() == CLASS_DEATH_KNIGHT) + if (GetClass() == CLASS_DEATH_KNIGHT) for (uint8 i = 0; i < MAX_RUNES; ++i) if (uint32 cd = GetRuneCooldown(i)) SetRuneCooldown(i, (cd > m_regenTimer) ? cd - m_regenTimer : 0); @@ -2006,7 +2006,7 @@ void Player::RegenerateAll() } Regenerate(POWER_RAGE); - if (getClass() == CLASS_DEATH_KNIGHT) + if (GetClass() == CLASS_DEATH_KNIGHT) Regenerate(POWER_RUNIC_POWER); m_regenTimerCount -= 2000; @@ -2067,8 +2067,8 @@ void Player::Regenerate(Powers power) bool recentCast = IsUnderLastManaUseEffect(); float ManaIncreaseRate = sWorld->getRate(RATE_POWER_MANA); - if (getLevel() < 15) - ManaIncreaseRate = sWorld->getRate(RATE_POWER_MANA) * (2.066f - (getLevel() * 0.066f)); + if (GetLevel() < 15) + ManaIncreaseRate = sWorld->getRate(RATE_POWER_MANA) * (2.066f - (GetLevel() * 0.066f)); if (recentCast) // Trinity Updates Mana in intervals of 2s, which is correct addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER) * ManaIncreaseRate * 0.001f * m_regenTimer; @@ -2171,8 +2171,8 @@ void Player::RegenerateHealth() float HealthIncreaseRate = sWorld->getRate(RATE_HEALTH); - if (getLevel() < 15) - HealthIncreaseRate = sWorld->getRate(RATE_HEALTH) * (2.066f - (getLevel() * 0.066f)); + if (GetLevel() < 15) + HealthIncreaseRate = sWorld->getRate(RATE_HEALTH) * (2.066f - (GetLevel() * 0.066f)); float addValue = 0.0f; @@ -2403,7 +2403,7 @@ void Player::SetGameMaster(bool on) SetPhaseMask(newPhase, false); m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON; - setFactionForRace(getRace()); + setFactionForRace(GetRace()); RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS); @@ -2537,7 +2537,7 @@ void Player::GiveXP(uint32 xp, Unit* victim, float group_rate) if (victim && victim->GetTypeId() == TYPEID_UNIT && !victim->ToCreature()->hasLootRecipient()) return; - uint8 level = getLevel(); + uint8 level = GetLevel(); sScriptMgr->OnGivePlayerXP(this, xp, victim); @@ -2567,7 +2567,7 @@ void Player::GiveXP(uint32 xp, Unit* victim, float group_rate) if (level < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) GiveLevel(level + 1); - level = getLevel(); + level = GetLevel(); nextLvlXP = GetUInt32Value(PLAYER_NEXT_LEVEL_XP); } @@ -2578,7 +2578,7 @@ void Player::GiveXP(uint32 xp, Unit* victim, float group_rate) // Current player experience not update (must be update by caller) void Player::GiveLevel(uint8 level) { - uint8 oldLevel = getLevel(); + uint8 oldLevel = GetLevel(); if (level == oldLevel) return; @@ -2586,10 +2586,10 @@ void Player::GiveLevel(uint8 level) guild->UpdateMemberData(this, GUILD_MEMBER_DATA_LEVEL, level); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), level, &info); + sObjectMgr->GetPlayerLevelInfo(GetRace(), GetClass(), level, &info); PlayerClassLevelInfo classInfo; - sObjectMgr->GetPlayerClassLevelInfo(getClass(), level, &classInfo); + sObjectMgr->GetPlayerClassLevelInfo(GetClass(), level, &classInfo); // send levelup info to client WorldPacket data(SMSG_LEVELUP_INFO, (4+4+MAX_POWERS*4+MAX_STATS*4)); @@ -2646,7 +2646,7 @@ void Player::GiveLevel(uint8 level) if (Pet* pet = GetPet()) pet->SynchronizeLevelWithOwner(); - if (MailLevelReward const* mailReward = sObjectMgr->GetMailLevelReward(level, getRaceMask())) + if (MailLevelReward const* mailReward = sObjectMgr->GetMailLevelReward(level, GetRaceMask())) { /// @todo Poor design of mail system SQLTransaction trans = CharacterDatabase.BeginTransaction(); @@ -2674,7 +2674,7 @@ void Player::GiveLevel(uint8 level) void Player::InitTalentForLevel() { - uint8 level = getLevel(); + uint8 level = GetLevel(); // talents base at level diff (talents = level - 9 but some can be used already) if (level < 10) { @@ -2718,13 +2718,13 @@ void Player::InitStatsForLevel(bool reapplyMods) _RemoveAllStatBonuses(); PlayerClassLevelInfo classInfo; - sObjectMgr->GetPlayerClassLevelInfo(getClass(), getLevel(), &classInfo); + sObjectMgr->GetPlayerClassLevelInfo(GetClass(), GetLevel(), &classInfo); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), getLevel(), &info); + sObjectMgr->GetPlayerLevelInfo(GetRace(), GetClass(), GetLevel(), &info); SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); - SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr->GetXPForLevel(getLevel())); + SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr->GetXPForLevel(GetLevel())); // reset before any aura state sources (health set/aura apply) SetUInt32Value(UNIT_FIELD_AURASTATE, 0); @@ -3905,7 +3905,7 @@ bool Player::ResetTalents(bool no_cost) // unlearn only talents for character class // some spell learned by one class as normal spells or know at creation but another class learn it as talent, // to prevent unexpected lost normal learned spell skip another class talents - if ((getClassMask() & talentTabInfo->ClassMask) == 0) + if ((GetClassMask() & talentTabInfo->ClassMask) == 0) continue; for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) @@ -4505,7 +4505,7 @@ void Player::BuildPlayerRepop() data << GetPackGUID(); SendDirectMessage(&data); - if (getRace() == RACE_NIGHTELF) + if (GetRace() == RACE_NIGHTELF) CastSpell(this, 20584, true); CastSpell(this, 8326, true); @@ -4622,15 +4622,15 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness) //Characters level 20 and up suffer from ten minutes of sickness. int32 startLevel = sWorld->getIntConfig(CONFIG_DEATH_SICKNESS_LEVEL); - if (int32(getLevel()) >= startLevel) + if (int32(GetLevel()) >= startLevel) { // set resurrection sickness CastSpell(this, 15007, true); // not full duration - if (int32(getLevel()) < startLevel+9) + if (int32(GetLevel()) < startLevel+9) { - int32 delta = (int32(getLevel()) - startLevel + 1)*MINUTE; + int32 delta = (int32(GetLevel()) - startLevel + 1)*MINUTE; if (Aura* aur = GetAura(15007, GetGUID())) { @@ -4709,7 +4709,7 @@ Corpse* Player::CreateCorpse() uint8 haircolor = GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_HAIR_COLOR_ID); uint8 facialhair = GetByteValue(PLAYER_BYTES_2, PLAYER_BYTES_2_OFFSET_FACIAL_STYLE); - _cfb1 = ((0x00) | (getRace() << 8) | (GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER) << 16) | (skin << 24)); + _cfb1 = ((0x00) | (GetRace() << 8) | (GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER) << 16) | (skin << 24)); _cfb2 = ((face) | (hairstyle << 8) | (haircolor << 16) | (facialhair << 24)); corpse->SetUInt32Value(CORPSE_FIELD_BYTES_1, _cfb1); @@ -5242,7 +5242,7 @@ void Player::UpdateDamageDoneMods(WeaponAttackType attackType, int32 skipEnchant amount += enchantmentEntry->amount[i]; break; case ITEM_ENCHANTMENT_TYPE_TOTEM: - if (getClass() == CLASS_SHAMAN) + if (GetClass() == CLASS_SHAMAN) amount += enchantmentEntry->amount[i] * item->GetTemplate()->Delay / 1000.0f; break; default: @@ -5301,8 +5301,8 @@ uint32 Player::GetShieldBlockValue() const float Player::GetMeleeCritFromAgility() const { - uint8 level = getLevel(); - uint32 pclass = getClass(); + uint8 level = GetLevel(); + uint32 pclass = GetClass(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; @@ -5349,8 +5349,8 @@ void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing) cons 2.00f/1.15f // Druid }; - uint8 level = getLevel(); - uint32 pclass = getClass(); + uint8 level = GetLevel(); + uint32 pclass = GetClass(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; @@ -5371,8 +5371,8 @@ void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing) cons float Player::GetSpellCritFromIntellect() const { - uint8 level = getLevel(); - uint32 pclass = getClass(); + uint8 level = GetLevel(); + uint32 pclass = GetClass(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; @@ -5388,14 +5388,14 @@ float Player::GetSpellCritFromIntellect() const float Player::GetRatingMultiplier(CombatRating cr) const { - uint8 level = getLevel(); + uint8 level = GetLevel(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; GtCombatRatingsEntry const* Rating = sGtCombatRatingsStore.LookupEntry(cr*GT_MAX_LEVEL+level-1); // gtOCTClassCombatRatingScalarStore.dbc starts with 1, CombatRating with zero, so cr+1 - GtOCTClassCombatRatingScalarEntry const* classRating = sGtOCTClassCombatRatingScalarStore.LookupEntry((getClass()-1)*GT_MAX_RATING+cr+1); + GtOCTClassCombatRatingScalarEntry const* classRating = sGtOCTClassCombatRatingScalarStore.LookupEntry((GetClass()-1)*GT_MAX_RATING+cr+1); if (!Rating || !classRating) return 1.0f; // By default use minimum coefficient (not must be called) @@ -5423,8 +5423,8 @@ float Player::GetExpertiseDodgeOrParryReduction(WeaponAttackType attType) const float Player::OCTRegenHPPerSpirit() const { - uint8 level = getLevel(); - uint32 pclass = getClass(); + uint8 level = GetLevel(); + uint32 pclass = GetClass(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; @@ -5446,8 +5446,8 @@ float Player::OCTRegenHPPerSpirit() const float Player::OCTRegenMPPerSpirit() const { - uint8 level = getLevel(); - uint32 pclass = getClass(); + uint8 level = GetLevel(); + uint32 pclass = GetClass(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; @@ -5863,9 +5863,9 @@ void Player::UpdateWeaponSkill(WeaponAttackType attType) void Player::UpdateCombatSkills(Unit* victim, WeaponAttackType attType, bool defense) { - uint8 plevel = getLevel(); // if defense than victim == attacker + uint8 plevel = GetLevel(); // if defense than victim == attacker uint8 greylevel = Trinity::XP::GetGrayLevel(plevel); - uint8 moblevel = victim->getLevelForTarget(this); + uint8 moblevel = victim->GetLevelForTarget(this); if (moblevel > plevel + 5) moblevel = plevel + 5; @@ -5880,7 +5880,7 @@ void Player::UpdateCombatSkills(Unit* victim, WeaponAttackType attType, bool def float chance = float(3 * lvldif * skilldif) / plevel; if (!defense) - if (getClass() == CLASS_WARRIOR || getClass() == CLASS_ROGUE) + if (GetClass() == CLASS_WARRIOR || GetClass() == CLASS_ROGUE) chance += chance * 0.02f * GetStat(STAT_INTELLECT); chance = chance < 1.0f ? 1.0f : chance; //minimum chance to increase skill is 1% @@ -5927,7 +5927,7 @@ void Player::UpdateSkillsForLevel() continue; uint32 pskill = itr->first; - SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(pskill, getRace(), getClass()); + SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(pskill, GetRace(), GetClass()); if (!rcEntry) continue; @@ -6450,17 +6450,17 @@ void Player::CheckAreaExploreAndOutdoor() if (areaEntry->area_level > 0) { - if (getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (GetLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { SendExplorationExperience(areaId, 0); } else { - int32 diff = int32(getLevel()) - areaEntry->area_level; + int32 diff = int32(GetLevel()) - areaEntry->area_level; uint32 XP; if (diff < -5) { - XP = uint32(sObjectMgr->GetBaseXP(getLevel()+5)*sWorld->getRate(RATE_XP_EXPLORE)); + XP = uint32(sObjectMgr->GetBaseXP(GetLevel()+5)*sWorld->getRate(RATE_XP_EXPLORE)); } else if (diff > 5) { @@ -6552,7 +6552,7 @@ int32 Player::CalculateReputationGain(ReputationSource source, uint32 creatureOr break; } - if (rate != 1.0f && creatureOrQuestLevel <= Trinity::XP::GetGrayLevel(getLevel())) + if (rate != 1.0f && creatureOrQuestLevel <= Trinity::XP::GetGrayLevel(GetLevel())) percent *= rate; if (percent <= 0.0f) @@ -6629,7 +6629,7 @@ void Player::RewardReputation(Unit* victim, float rate) if (Rep->RepFaction1 && (!Rep->TeamDependent || team == ALLIANCE)) { - int32 donerep1 = CalculateReputationGain(REPUTATION_SOURCE_KILL, victim->getLevel(), Rep->RepValue1, ChampioningFaction ? ChampioningFaction : Rep->RepFaction1); + int32 donerep1 = CalculateReputationGain(REPUTATION_SOURCE_KILL, victim->GetLevel(), Rep->RepValue1, ChampioningFaction ? ChampioningFaction : Rep->RepFaction1); donerep1 = int32(donerep1 * rate); FactionEntry const* factionEntry1 = sFactionStore.LookupEntry(ChampioningFaction ? ChampioningFaction : Rep->RepFaction1); @@ -6640,7 +6640,7 @@ void Player::RewardReputation(Unit* victim, float rate) if (Rep->RepFaction2 && (!Rep->TeamDependent || team == HORDE)) { - int32 donerep2 = CalculateReputationGain(REPUTATION_SOURCE_KILL, victim->getLevel(), Rep->RepValue2, ChampioningFaction ? ChampioningFaction : Rep->RepFaction2); + int32 donerep2 = CalculateReputationGain(REPUTATION_SOURCE_KILL, victim->GetLevel(), Rep->RepValue2, ChampioningFaction ? ChampioningFaction : Rep->RepFaction2); donerep2 = int32(donerep2 * rate); FactionEntry const* factionEntry2 = sFactionStore.LookupEntry(ChampioningFaction ? ChampioningFaction : Rep->RepFaction2); @@ -6773,9 +6773,9 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto if (GetTeam() == plrVictim->GetTeam() && !sWorld->IsFFAPvPRealm()) return false; - uint8 k_level = getLevel(); + uint8 k_level = GetLevel(); uint8 k_grey = Trinity::XP::GetGrayLevel(k_level); - uint8 v_level = victim->getLevel(); + uint8 v_level = victim->GetLevel(); if (v_level <= k_grey) return false; @@ -6808,8 +6808,8 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto // and those in a lifetime ApplyModUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 1, true); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL); - UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS, victim->getClass()); - UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_RACE, victim->getRace()); + UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS, victim->GetClass()); + UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_RACE, victim->GetRace()); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA, GetAreaId()); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL, 1, 0, victim); } @@ -7222,7 +7222,7 @@ void Player::DuelComplete(DuelCompleteType type) opponent->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL, 1); // Credit for quest Death's Challenge - if (getClass() == CLASS_DEATH_KNIGHT && opponent->GetQuestStatus(12733) == QUEST_STATUS_INCOMPLETE) + if (GetClass() == CLASS_DEATH_KNIGHT && opponent->GetQuestStatus(12733) == QUEST_STATUS_INCOMPLETE) opponent->CastSpell(opponent, 52994, true); // Honor points after duel (the winner) - ImpConfig @@ -7339,7 +7339,7 @@ ScalingStatValuesEntry const* Player::GetScalingStatValuesFor(ItemTemplate const return nullptr; // req. check at equip, but allow use for extended range if range limit max level, set proper level - uint32 const ssd_level = std::min(uint32(getLevel()), ssd->MaxLevel); + uint32 const ssd_level = std::min(uint32(GetLevel()), ssd->MaxLevel); return sScalingStatValuesStore.LookupEntry(ssd_level); } @@ -7593,7 +7593,7 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply _ApplyWeaponDamage(slot, proto, apply); // Druids get feral AP bonus from weapon dps (also use DPS from ScalingStatValue) - if (getClass() == CLASS_DRUID) + if (GetClass() == CLASS_DRUID) { int32 dpsMod = 0; int32 feral_bonus = 0; @@ -8050,9 +8050,9 @@ void Player::CastItemCombatSpell(DamageInfo const& damageInfo, Item* item, ItemT CastSpellExtraArgs args(item); // reduce effect values if enchant is limited - if (entry && (entry->AttributesMask & ENCHANT_PROC_ATTR_LIMIT_60) && target->getLevel() > 60) + if (entry && (entry->AttributesMask & ENCHANT_PROC_ATTR_LIMIT_60) && target->GetLevel() > 60) { - int32 const lvlDifference = target->getLevel() - 60; + int32 const lvlDifference = target->GetLevel() - 60; int32 const lvlPenaltyFactor = 4; // 4% lost effectiveness per level int32 const effectPct = std::max(0, 100 - (lvlDifference * lvlPenaltyFactor)); @@ -8350,7 +8350,7 @@ void Player::RemovedInsignia(Player* looterPlr) // We store the level of our player in the gold field // We retrieve this information at Player::SendLoot() - bones->loot.gold = getLevel(); + bones->loot.gold = GetLevel(); bones->lootRecipient = looterPlr; looterPlr->SendLoot(bones->GetGUID(), LOOT_INSIGNIA); } @@ -8618,8 +8618,8 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type) loot->FillLoot(lootid, LootTemplates_Pickpocketing, this, true); // Generate extra money for pick pocket loot - const uint32 a = urand(0, creature->getLevel() / 2); - const uint32 b = urand(0, getLevel() / 2); + const uint32 a = urand(0, creature->GetLevel() / 2); + const uint32 b = urand(0, GetLevel() / 2); loot->gold = uint32(10 * (a + b) * sWorld->getRate(RATE_DROP_MONEY)); permission = OWNER_PERMISSION; } @@ -9523,7 +9523,7 @@ void Player::SetSheath(SheathState sheathed) uint8 Player::FindEquipSlot(ItemTemplate const* proto, uint32 slot, bool swap) const { - uint8 playerClass = getClass(); + uint8 playerClass = GetClass(); uint8 slots[4]; slots[0] = NULL_SLOT; @@ -11294,7 +11294,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool ScalingStatDistributionEntry const* ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : 0; // check allowed level (extend range to upper values if MaxLevel more or equal max player level, this let GM set high level with 1...max range items) - if (ssd && ssd->MaxLevel < DEFAULT_MAX_LEVEL && ssd->MaxLevel < getLevel()) + if (ssd && ssd->MaxLevel < DEFAULT_MAX_LEVEL && ssd->MaxLevel < GetLevel()) return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED; uint8 eslot = FindEquipSlot(pProto, slot, swap); @@ -11674,7 +11674,7 @@ InventoryResult Player::CanUseItem(Item* pItem, bool not_loading) const // In fact it's a visual bug, everything works properly... I need sniffs of operations with // binded to account items from off server. - switch (getClass()) + switch (GetClass()) { case CLASS_HUNTER: case CLASS_SHAMAN: @@ -11710,7 +11710,7 @@ InventoryResult Player::CanUseItem(ItemTemplate const* proto) const (((proto->Flags2 & ITEM_FLAG2_FACTION_ALLIANCE) && GetTeam() != ALLIANCE))) return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM; - if ((proto->AllowableClass & getClassMask()) == 0 || (proto->AllowableRace & getRaceMask()) == 0) + if ((proto->AllowableClass & GetClassMask()) == 0 || (proto->AllowableRace & GetRaceMask()) == 0) return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM; if (proto->RequiredSkill != 0) @@ -11724,7 +11724,7 @@ InventoryResult Player::CanUseItem(ItemTemplate const* proto) const if (proto->RequiredSpell != 0 && !HasSpell(proto->RequiredSpell)) return EQUIP_ERR_NO_REQUIRED_PROFICIENCY; - if (getLevel() < proto->RequiredLevel) + if (GetLevel() < proto->RequiredLevel) return EQUIP_ERR_CANT_EQUIP_LEVEL_I; // If World Event is not active, prevent using event dependant items @@ -11762,7 +11762,7 @@ InventoryResult Player::CanRollForItemInLFG(ItemTemplate const* proto, WorldObje SKILL_FISHING }; //Copy from function Item::GetSkill() - if ((proto->AllowableClass & getClassMask()) == 0 || (proto->AllowableRace & getRaceMask()) == 0) + if ((proto->AllowableClass & GetClassMask()) == 0 || (proto->AllowableRace & GetRaceMask()) == 0) return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM; if (proto->RequiredSpell != 0 && !HasSpell(proto->RequiredSpell)) @@ -11776,7 +11776,7 @@ InventoryResult Player::CanRollForItemInLFG(ItemTemplate const* proto, WorldObje return EQUIP_ERR_CANT_EQUIP_SKILL; } - uint8 _class = getClass(); + uint8 _class = GetClass(); if (proto->Class == ITEM_CLASS_WEAPON && GetSkillValue(item_weapon_skills[proto->SubClass]) == 0) return EQUIP_ERR_NO_REQUIRED_PROFICIENCY; @@ -11785,7 +11785,7 @@ InventoryResult Player::CanRollForItemInLFG(ItemTemplate const* proto, WorldObje { if (_class == CLASS_WARRIOR || _class == CLASS_PALADIN || _class == CLASS_DEATH_KNIGHT) { - if (getLevel() < 40) + if (GetLevel() < 40) { if (proto->SubClass != ITEM_SUBCLASS_ARMOR_MAIL) return EQUIP_ERR_CANT_DO_RIGHT_NOW; @@ -11795,7 +11795,7 @@ InventoryResult Player::CanRollForItemInLFG(ItemTemplate const* proto, WorldObje } else if (_class == CLASS_HUNTER || _class == CLASS_SHAMAN) { - if (getLevel() < 40) + if (GetLevel() < 40) { if (proto->SubClass != ITEM_SUBCLASS_ARMOR_LEATHER) return EQUIP_ERR_CANT_DO_RIGHT_NOW; @@ -12085,7 +12085,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update) if (pProto && IsInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer == 0) { - uint32 cooldownSpell = getClass() == CLASS_ROGUE ? 6123 : 6119; + uint32 cooldownSpell = GetClass() == CLASS_ROGUE ? 6123 : 6119; SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(cooldownSpell); if (!spellProto) @@ -13657,7 +13657,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool if (!ignore_condition && pEnchant->EnchantmentCondition && !EnchantmentFitsRequirements(pEnchant->EnchantmentCondition, -1)) return; - if (pEnchant->requiredLevel > getLevel()) + if (pEnchant->requiredLevel > GetLevel()) return; if (pEnchant->requiredSkill > 0 && pEnchant->requiredSkillValue > GetSkillValue(pEnchant->requiredSkill)) @@ -14150,7 +14150,7 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool } case GOSSIP_OPTION_LEARNDUALSPEC: case GOSSIP_OPTION_DUALSPEC_INFO: - if (!(GetSpecsCount() == 1 && creature->CanResetTalents(this, false) && !(getLevel() < sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)))) + if (!(GetSpecsCount() == 1 && creature->CanResetTalents(this, false) && !(GetLevel() < sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)))) canTalk = false; break; case GOSSIP_OPTION_UNLEARNTALENTS: @@ -14170,7 +14170,7 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool canTalk = false; break; case GOSSIP_OPTION_STABLEPET: - if (getClass() != CLASS_HUNTER) + if (GetClass() != CLASS_HUNTER) canTalk = false; break; case GOSSIP_OPTION_QUESTGIVER: @@ -14227,12 +14227,12 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool LocaleConstant locale = GetSession()->GetSessionDbLocaleIndex(); if (optionBroadcastText) - strOptionText = optionBroadcastText->GetText(locale, getGender()); + strOptionText = optionBroadcastText->GetText(locale, GetGender()); else strOptionText = itr->second.OptionText; if (boxBroadcastText) - strBoxText = boxBroadcastText->GetText(locale, getGender()); + strBoxText = boxBroadcastText->GetText(locale, GetGender()); else strBoxText = itr->second.BoxText; @@ -14369,7 +14369,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men GetSession()->SendTrainerList(source->ToCreature()); break; case GOSSIP_OPTION_LEARNDUALSPEC: - if (GetSpecsCount() == 1 && getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)) + if (GetSpecsCount() == 1 && GetLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)) { // Cast spells that teach dual spec // Both are also ImplicitTarget self and must be cast by player @@ -14666,7 +14666,7 @@ bool Player::CanSeeStartQuest(Quest const* quest) const SatisfyQuestDay(quest, false) && SatisfyQuestWeek(quest, false) && SatisfyQuestMonth(quest, false) && SatisfyQuestSeasonal(quest, false)) { - return getLevel() + sWorld->getIntConfig(CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF) >= quest->GetMinLevel(); + return GetLevel() + sWorld->getIntConfig(CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF) >= quest->GetMinLevel(); } return false; @@ -15127,7 +15127,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, XP *= GetTotalAuraMultiplier(SPELL_AURA_MOD_XP_QUEST_PCT); int32 moneyRew = 0; - if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (GetLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) GiveXP(XP, nullptr); else moneyRew = int32(quest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY)); @@ -15145,7 +15145,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, } // honor reward - if (uint32 honor = quest->CalculateHonorGain(getLevel())) + if (uint32 honor = quest->CalculateHonorGain(GetLevel())) RewardHonor(nullptr, 0, honor); // title reward @@ -15347,7 +15347,7 @@ bool Player::SatisfyQuestSkill(Quest const* qInfo, bool msg) const bool Player::SatisfyQuestLevel(Quest const* qInfo, bool msg) const { - if (getLevel() < qInfo->GetMinLevel()) + if (GetLevel() < qInfo->GetMinLevel()) { if (msg) { @@ -15358,7 +15358,7 @@ bool Player::SatisfyQuestLevel(Quest const* qInfo, bool msg) const return false; } - if (qInfo->GetMaxLevel() > 0 && getLevel() > qInfo->GetMaxLevel()) + if (qInfo->GetMaxLevel() > 0 && GetLevel() > qInfo->GetMaxLevel()) { if (msg) { @@ -15528,7 +15528,7 @@ bool Player::SatisfyQuestClass(Quest const* qInfo, bool msg) const if (reqClass == 0) return true; - if ((reqClass & getClassMask()) == 0) + if ((reqClass & GetClassMask()) == 0) { if (msg) { @@ -15548,7 +15548,7 @@ bool Player::SatisfyQuestRace(Quest const* qInfo, bool msg) const uint32 reqraces = qInfo->GetAllowableRaces(); if (reqraces == 0) return true; - if ((reqraces & getRaceMask()) == 0) + if ((reqraces & GetRaceMask()) == 0) { if (msg) { @@ -16041,7 +16041,7 @@ QuestGiverStatus Player::GetQuestDialogStatus(Object* questgiver) { if (SatisfyQuestLevel(quest, false)) { - if (getLevel() <= (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF))) + if (GetLevel() <= (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF))) { if (quest->IsDaily()) result2 = DIALOG_STATUS_AVAILABLE_REP; @@ -16690,7 +16690,7 @@ void Player::SendQuestReward(Quest const* quest, uint32 XP) const WorldPacket data(SMSG_QUESTGIVER_QUEST_COMPLETE, (4+4+4+4+4)); data << uint32(questid); - if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (GetLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { data << uint32(XP); data << uint32(quest->GetRewOrReqMoney()); @@ -17125,10 +17125,10 @@ bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder) SetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_GENDER, gender); // check if race/class combination is valid - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(GetRace(), GetClass()); if (!info) { - TC_LOG_ERROR("entities.player", "Player::LoadFromDB: Player (%s) has wrong race/class (%u/%u), can't load.", guid.ToString().c_str(), getRace(), getClass()); + TC_LOG_ERROR("entities.player", "Player::LoadFromDB: Player (%s) has wrong race/class (%u/%u), can't load.", guid.ToString().c_str(), GetRace(), GetClass()); return false; } @@ -17202,7 +17202,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder) //Need to call it to initialize m_team (m_team can be calculated from race) //Other way is to saves m_team into characters table. - setFactionForRace(getRace()); + setFactionForRace(GetRace()); // load home bind and check in same time class/race pair, it used later for restore broken positions if (!_LoadHomeBind(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_HOME_BIND))) @@ -18674,7 +18674,7 @@ void Player::_LoadGroup(PreparedQueryResult result) uint8 subgroup = group->GetMemberGroup(GetGUID()); SetGroup(group, subgroup); - if (getLevel() >= LEVELREQUIREMENT_HEROIC) + if (GetLevel() >= LEVELREQUIREMENT_HEROIC) { // the group leader may change the instance difficulty while the player is offline SetDungeonDifficulty(group->GetDungeonDifficulty()); @@ -19000,9 +19000,9 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report if (!sWorld->getBoolConfig(CONFIG_INSTANCE_IGNORE_LEVEL)) { - if (ar->levelMin && getLevel() < ar->levelMin) + if (ar->levelMin && GetLevel() < ar->levelMin) LevelMin = ar->levelMin; - if (ar->levelMax && getLevel() > ar->levelMax) + if (ar->levelMax && GetLevel() > ar->levelMax) LevelMax = ar->levelMax; } @@ -19138,11 +19138,11 @@ void Player::AddInstanceEnterTime(uint32 instanceId, time_t enterTime) bool Player::_LoadHomeBind(PreparedQueryResult result) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(GetRace(), GetClass()); if (!info) { TC_LOG_ERROR("entities.player", "Player::_LoadHomeBind: Player '%s' (%s) has incorrect race/class (%u/%u) pair. Can't load.", - GetGUID().ToString().c_str(), GetName().c_str(), uint32(getRace()), uint32(getClass())); + GetGUID().ToString().c_str(), GetName().c_str(), uint32(GetRace()), uint32(GetClass())); return false; } @@ -19239,10 +19239,10 @@ void Player::SaveToDB(bool create /*=false*/) stmt->setUInt32(index++, GetGUID().GetCounter()); stmt->setUInt32(index++, GetSession()->GetAccountId()); stmt->setString(index++, GetName()); - stmt->setUInt8(index++, getRace()); - stmt->setUInt8(index++, getClass()); + stmt->setUInt8(index++, GetRace()); + stmt->setUInt8(index++, GetClass()); stmt->setUInt8(index++, GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER)); // save gender from PLAYER_BYTES_3, UNIT_BYTES_0 changes with every transform effect - stmt->setUInt8(index++, getLevel()); + stmt->setUInt8(index++, GetLevel()); stmt->setUInt32(index++, GetUInt32Value(PLAYER_XP)); stmt->setUInt32(index++, GetMoney()); stmt->setUInt8(index++, GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_SKIN_ID)); @@ -19349,10 +19349,10 @@ void Player::SaveToDB(bool create /*=false*/) // Update query stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER); stmt->setString(index++, GetName()); - stmt->setUInt8(index++, getRace()); - stmt->setUInt8(index++, getClass()); + stmt->setUInt8(index++, GetRace()); + stmt->setUInt8(index++, GetClass()); stmt->setUInt8(index++, GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER)); // save gender from PLAYER_BYTES_3, UNIT_BYTES_0 changes with every transform effect - stmt->setUInt8(index++, getLevel()); + stmt->setUInt8(index++, GetLevel()); stmt->setUInt32(index++, GetUInt32Value(PLAYER_XP)); stmt->setUInt32(index++, GetMoney()); stmt->setUInt8(index++, GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_SKIN_ID)); @@ -20147,7 +20147,7 @@ void Player::_SaveSpells(SQLTransaction& trans) void Player::_SaveStats(SQLTransaction& trans) const { // check if stat saving is enabled and if char level is high enough - if (!sWorld->getIntConfig(CONFIG_MIN_LEVEL_STAT_SAVE) || getLevel() < sWorld->getIntConfig(CONFIG_MIN_LEVEL_STAT_SAVE)) + if (!sWorld->getIntConfig(CONFIG_MIN_LEVEL_STAT_SAVE) || GetLevel() < sWorld->getIntConfig(CONFIG_MIN_LEVEL_STAT_SAVE)) return; PreparedStatement* stmt; @@ -20756,7 +20756,7 @@ void Player::Whisper(uint32 textId, Player* target, bool /*isBossWhisper = false LocaleConstant locale = target->GetSession()->GetSessionDbLocaleIndex(); WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, getGender()), 0, "", locale); + ChatHandler::BuildChatPacket(data, CHAT_MSG_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, GetGender()), 0, "", locale); target->SendDirectMessage(&data); } @@ -20930,7 +20930,7 @@ void Player::CharmSpellInitialize() if (charm->GetTypeId() != TYPEID_PLAYER) { //CreatureInfo const* cinfo = charm->ToCreature()->GetCreatureTemplate(); - //if (cinfo && cinfo->type == CREATURE_TYPE_DEMON && getClass() == CLASS_WARLOCK) + //if (cinfo && cinfo->type == CREATURE_TYPE_DEMON && GetClass() == CLASS_WARLOCK) { for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i) if (charmInfo->GetCharmSpell(i)->GetAction()) @@ -21149,7 +21149,7 @@ void Player::LeaveAllArenaTeams(ObjectGuid guid) void Player::SetRestBonus(float rest_bonus_new) { // Prevent resting on max level - if (getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (GetLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) rest_bonus_new = 0; if (rest_bonus_new < 0) @@ -21301,7 +21301,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc // only one mount ID for both sides. Probably not good to use 315 in case DBC nodes // change but I couldn't find a suitable alternative. OK to use class because only DK // can use this taxi. - uint32 mount_display_id = sObjectMgr->GetTaxiMountDisplayId(sourcenode, GetTeam(), npc == nullptr || (sourcenode == 315 && getClass() == CLASS_DEATH_KNIGHT)); + uint32 mount_display_id = sObjectMgr->GetTaxiMountDisplayId(sourcenode, GetTeam(), npc == nullptr || (sourcenode == 315 && GetClass() == CLASS_DEATH_KNIGHT)); // in spell case allow 0 model if ((mount_display_id == 0 && spellid == 0) || sourcepath == 0) @@ -21484,7 +21484,7 @@ void Player::InitDataForForm(bool reapplyMods) void Player::InitDisplayIds() { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(GetRace(), GetClass()); if (!info) { TC_LOG_ERROR("entities.player", "Player::InitDisplayIds: Player '%s' (%s) has incorrect race/class pair. Can't init display ids.", GetName().c_str(), GetGUID().ToString().c_str()); @@ -21590,7 +21590,7 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorguid, uint32 vendorslot, uin return false; } - if (!(pProto->AllowableClass & getClassMask()) && pProto->Bonding == BIND_WHEN_PICKED_UP && !IsGameMaster()) + if (!(pProto->AllowableClass & GetClassMask()) && pProto->Bonding == BIND_WHEN_PICKED_UP && !IsGameMaster()) { SendBuyError(BUY_ERR_CANT_FIND_ITEM, nullptr, item, 0); return false; @@ -22197,10 +22197,10 @@ void Player::ReportedAfkBy(Player* reporter) WorldLocation Player::GetStartPosition() const { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(GetRace(), GetClass()); ASSERT(info); uint32 mapId = info->mapId; - if (getClass() == CLASS_DEATH_KNIGHT && HasSpell(50977)) + if (GetClass() == CLASS_DEATH_KNIGHT && HasSpell(50977)) mapId = 0; return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0); } @@ -22802,7 +22802,7 @@ void Player::ResetSpells(bool myClassOnly) if (myClassOnly) { - ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(getClass()); + ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(GetClass()); if (!clsEntry) return; family = clsEntry->spellfamily; @@ -22850,13 +22850,13 @@ void Player::LearnCustomSpells() return; // learn default race/class spells - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(GetRace(), GetClass()); ASSERT(info); for (PlayerCreateInfoSpells::const_iterator itr = info->customSpells.begin(); itr != info->customSpells.end(); ++itr) { uint32 tspell = *itr; TC_LOG_DEBUG("entities.player.loading", "Player::LearnCustomSpells: Player '%s' (%s, Class: %u Race: %u): Adding initial spell (SpellID: %u)", - GetName().c_str(), GetGUID().ToString().c_str(), uint32(getClass()), uint32(getRace()), tspell); + GetName().c_str(), GetGUID().ToString().c_str(), uint32(GetClass()), uint32(GetRace()), tspell); if (!IsInWorld()) // will send in INITIAL_SPELLS in list anyway at map add AddSpell(tspell, true, true, true, false); else // but send in normal spell in game learn case @@ -22867,7 +22867,7 @@ void Player::LearnCustomSpells() void Player::LearnDefaultSkills() { // learn default race/class skills - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(GetRace(), GetClass()); ASSERT(info); for (PlayerCreateInfoSkills::const_iterator itr = info->skills.begin(); itr != info->skills.end(); ++itr) { @@ -22881,11 +22881,11 @@ void Player::LearnDefaultSkills() void Player::LearnDefaultSkill(uint32 skillId, uint16 rank) { - SkillRaceClassInfoEntry const* rcInfo = GetSkillRaceClassInfo(skillId, getRace(), getClass()); + SkillRaceClassInfoEntry const* rcInfo = GetSkillRaceClassInfo(skillId, GetRace(), GetClass()); if (!rcInfo) return; - TC_LOG_DEBUG("entities.player.loading", "PLAYER (Class: %u Race: %u): Adding initial skill, id = %u", uint32(getClass()), uint32(getRace()), skillId); + TC_LOG_DEBUG("entities.player.loading", "PLAYER (Class: %u Race: %u): Adding initial skill, id = %u", uint32(GetClass()), uint32(GetRace()), skillId); switch (GetSkillRangeType(rcInfo)) { case SKILL_RANGE_LANGUAGE: @@ -22899,8 +22899,8 @@ void Player::LearnDefaultSkill(uint32 skillId, uint16 rank) skillValue = maxValue; else if (rcInfo->Flags & SKILL_FLAG_ALWAYS_MAX_VALUE) skillValue = maxValue; - else if (getClass() == CLASS_DEATH_KNIGHT) - skillValue = std::min(std::max<uint16>({ 1, uint16((getLevel() - 1) * 5) }), maxValue); + else if (GetClass() == CLASS_DEATH_KNIGHT) + skillValue = std::min(std::max<uint16>({ 1, uint16((GetLevel() - 1) * 5) }), maxValue); else if (skillId == SKILL_FIST_WEAPONS) skillValue = std::max<uint16>(1, GetSkillValue(SKILL_UNARMED)); else if (skillId == SKILL_LOCKPICKING) @@ -22922,8 +22922,8 @@ void Player::LearnDefaultSkill(uint32 skillId, uint16 rank) uint16 skillValue = 1; if (rcInfo->Flags & SKILL_FLAG_ALWAYS_MAX_VALUE) skillValue = maxValue; - else if (getClass() == CLASS_DEATH_KNIGHT) - skillValue = std::min(std::max<uint16>({ uint16(1), uint16((getLevel() - 1) * 5) }), maxValue); + else if (GetClass() == CLASS_DEATH_KNIGHT) + skillValue = std::min(std::max<uint16>({ uint16(1), uint16((GetLevel() - 1) * 5) }), maxValue); SetSkill(skillId, rank, skillValue, maxValue); break; @@ -22998,8 +22998,8 @@ void Player::LearnQuestRewardedSpells() void Player::LearnSkillRewardedSpells(uint32 skillId, uint32 skillValue) { - uint32 raceMask = getRaceMask(); - uint32 classMask = getClassMask(); + uint32 raceMask = GetRaceMask(); + uint32 classMask = GetClassMask(); for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j) { SkillLineAbilityEntry const* ability = sSkillLineAbilityStore.LookupEntry(j); @@ -23295,7 +23295,7 @@ bool Player::GetBGAccessByLevel(BattlegroundTypeId bgTypeId) const return false; // limit check leel to dbc compatible level range - uint32 level = getLevel(); + uint32 level = GetLevel(); if (level > DEFAULT_MAX_LEVEL) level = DEFAULT_MAX_LEVEL; @@ -23329,8 +23329,8 @@ Player* Player::GetTrader() const bool Player::IsSpellFitByClassAndRace(uint32 spell_id) const { - uint32 racemask = getRaceMask(); - uint32 classmask = getClassMask(); + uint32 racemask = GetRaceMask(); + uint32 classmask = GetClassMask(); SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(spell_id); if (bounds.first == bounds.second) @@ -23347,7 +23347,7 @@ bool Player::IsSpellFitByClassAndRace(uint32 spell_id) const continue; // skip wrong class and race skill saved in SkillRaceClassInfo.dbc - if (!GetSkillRaceClassInfo(_spell_idx->second->skillId, getRace(), getClass())) + if (!GetSkillRaceClassInfo(_spell_idx->second->skillId, GetRace(), GetClass())) continue; return true; @@ -23706,8 +23706,8 @@ uint32 Player::GetResurrectionSpellId() // Used in triggers for check "Only to targets that grant experience or honor" req bool Player::isHonorOrXPTarget(Unit* victim) const { - uint8 v_level = victim->getLevel(); - uint8 k_grey = Trinity::XP::GetGrayLevel(getLevel()); + uint8 v_level = victim->GetLevel(); + uint8 k_grey = Trinity::XP::GetGrayLevel(GetLevel()); // Victim level less gray level if (v_level <= k_grey && !sWorld->getIntConfig(CONFIG_MIN_CREATURE_SCALED_XP_RATIO)) @@ -23724,7 +23724,7 @@ bool Player::isHonorOrXPTarget(Unit* victim) const bool Player::GetsRecruitAFriendBonus(bool forXP) { bool recruitAFriend = false; - if (getLevel() <= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL) || !forXP) + if (GetLevel() <= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL) || !forXP) { if (Group* group = GetGroup()) { @@ -23740,12 +23740,12 @@ bool Player::GetsRecruitAFriendBonus(bool forXP) if (forXP) { // level must be allowed to get RaF bonus - if (player->getLevel() > sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL)) + if (player->GetLevel() > sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL)) continue; // level difference must be small enough to get RaF bonus, UNLESS we are lower level - if (player->getLevel() < getLevel()) - if (uint8(getLevel() - player->getLevel()) > sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL_DIFFERENCE)) + if (player->GetLevel() < GetLevel()) + if (uint8(GetLevel() - player->GetLevel()) > sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL_DIFFERENCE)) continue; } @@ -24192,7 +24192,7 @@ void Player::AtExitCombat() Unit::AtExitCombat(); UpdatePotionCooldown(); - if (getClass() == CLASS_DEATH_KNIGHT) + if (GetClass() == CLASS_DEATH_KNIGHT) for (uint8 i = 0; i < MAX_RUNES; ++i) { SetRuneTimer(i, 0xFFFFFFFF); @@ -24340,7 +24340,7 @@ bool Player::CanCaptureTowerPoint() const uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair, BarberShopStyleEntry const* newSkin) const { - uint8 level = getLevel(); + uint8 level = GetLevel(); if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL; // max level in this dbc @@ -24382,7 +24382,7 @@ void Player::InitGlyphsForLevel() if (gs->Order) SetGlyphSlot(gs->Order - 1, gs->Id); - uint8 level = getLevel(); + uint8 level = GetLevel(); uint32 value = 0; // 0x3F = 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 for 80 level @@ -24578,7 +24578,7 @@ static RuneType runeSlotTypes[MAX_RUNES] = void Player::InitRunes() { - if (getClass() != CLASS_DEATH_KNIGHT) + if (GetClass() != CLASS_DEATH_KNIGHT) return; m_runes = new Runes; @@ -24726,12 +24726,12 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot) uint32 Player::CalculateTalentsPoints() const { - uint32 base_talent = getLevel() < 10 ? 0 : getLevel()-9; + uint32 base_talent = GetLevel() < 10 ? 0 : GetLevel()-9; - if (getClass() != CLASS_DEATH_KNIGHT || GetMapId() != 609) + if (GetClass() != CLASS_DEATH_KNIGHT || GetMapId() != 609) return uint32(base_talent * sWorld->getRate(RATE_TALENT)); - uint32 talentPointsForLevel = getLevel() < 56 ? 0 : getLevel() - 55; + uint32 talentPointsForLevel = GetLevel() < 56 ? 0 : GetLevel() - 55; talentPointsForLevel += m_questRewardTalentCount; if (talentPointsForLevel > base_talent) @@ -24775,11 +24775,11 @@ void Player::_LoadSkills(PreparedQueryResult result) uint16 value = fields[1].GetUInt16(); uint16 max = fields[2].GetUInt16(); - SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skill, getRace(), getClass()); + SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skill, GetRace(), GetClass()); if (!rcEntry) { TC_LOG_ERROR("entities.player", "Player::_LoadSkills: Player '%s' (%s, Race: %u, Class: %u) has forbidden skill %u for his race/class combination", - GetName().c_str(), GetGUID().ToString().c_str(), uint32(getRace()), uint32(getClass()), skill); + GetName().c_str(), GetGUID().ToString().c_str(), uint32(GetRace()), uint32(GetClass()), skill); mSkillStatus.insert(SkillStatusMap::value_type(skill, SkillStatusData(0, SKILL_DELETED))); continue; @@ -25065,7 +25065,7 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank) return; // prevent learn talent for different class (cheating) - if ((getClassMask() & talentTabInfo->ClassMask) == 0) + if ((GetClassMask() & talentTabInfo->ClassMask) == 0) return; // find current max talent rank (0~5) @@ -25369,7 +25369,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket* data) *data << uint8(talentIdCount); // [PH], talentIdCount // find class talent tabs (all players have 3 talent tabs) - uint32 const* talentTabIds = GetTalentTabPages(getClass()); + uint32 const* talentTabIds = GetTalentTabPages(GetClass()); for (uint8 i = 0; i < MAX_TALENT_TABS; ++i) { @@ -25934,7 +25934,7 @@ void Player::ActivateSpec(uint8 spec) // unlearn only talents for character class // some spell learned by one class as normal spells or know at creation but another class learn it as talent, // to prevent unexpected lost normal learned spell skip another class talents - if ((getClassMask() & talentTabInfo->ClassMask) == 0) + if ((GetClassMask() & talentTabInfo->ClassMask) == 0) continue; for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) @@ -25977,7 +25977,7 @@ void Player::ActivateSpec(uint8 spec) continue; // learn only talents for character class - if ((getClassMask() & talentTabInfo->ClassMask) == 0) + if ((GetClassMask() & talentTabInfo->ClassMask) == 0) continue; // learn highest talent rank that exists in newly activated spec @@ -26539,7 +26539,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy pet->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE); pet->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); - pet->InitStatsForLevel(getLevel()); + pet->InitStatsForLevel(GetLevel()); SetMinion(pet, true); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 9c481ee64b4..95a639243fd 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -942,7 +942,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void RemoveSocial(); PlayerTaxi m_taxi; - void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(getRace(), getClass(), getLevel()); } + void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(GetRace(), GetClass(), GetLevel()); } bool ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc = nullptr, uint32 spellid = 0); bool ActivateTaxiPathTo(uint32 taxi_path_id, uint32 spellid = 0); void FinishTaxiFlight(); @@ -1179,7 +1179,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> /*** QUEST SYSTEM ***/ /*********************************************************/ - int32 GetQuestLevel(Quest const* quest) const { return quest && (quest->GetQuestLevel() > 0) ? quest->GetQuestLevel() : getLevel(); } + int32 GetQuestLevel(Quest const* quest) const { return quest && (quest->GetQuestLevel() > 0) ? quest->GetQuestLevel() : GetLevel(); } void PrepareQuestMenu(ObjectGuid guid); void SendPreparedQuest(ObjectGuid guid); diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index 59d9be98a54..bf95955de6a 100644 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -243,8 +243,8 @@ void SocialMgr::GetFriendInfo(Player* player, ObjectGuid const& friendGUID, Frie } friendInfo.Area = target->GetZoneId(); - friendInfo.Level = target->getLevel(); - friendInfo.Class = target->getClass(); + friendInfo.Level = target->GetLevel(); + friendInfo.Class = target->GetClass(); } } diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index c002957be90..47d1cceb7fa 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -81,7 +81,7 @@ void Totem::InitStats(uint32 duration) m_duration = duration; - SetLevel(GetOwner()->getLevel()); + SetLevel(GetOwner()->GetLevel()); } void Totem::InitSummon() diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index c93dc1b42a3..6ba1ba8695d 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -338,7 +338,7 @@ void Player::ApplyFeralAPBonus(int32 amount, bool apply) void Player::UpdateAttackPowerAndDamage(bool ranged) { float val2 = 0.0f; - float level = float(getLevel()); + float level = float(GetLevel()); UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER; @@ -352,7 +352,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS; index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER; - switch (getClass()) + switch (GetClass()) { case CLASS_HUNTER: val2 = level * 2.0f + GetStat(STAT_AGILITY) - 10.0f; @@ -379,7 +379,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) } else { - switch (getClass()) + switch (GetClass()) { case CLASS_WARRIOR: val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; @@ -427,11 +427,11 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) switch (GetShapeshiftForm()) { case FORM_CAT: - val2 = getLevel() * levelBonus + GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f + weaponBonus + m_baseFeralAP; + val2 = GetLevel() * levelBonus + GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f + weaponBonus + m_baseFeralAP; break; case FORM_BEAR: case FORM_DIREBEAR: - val2 = getLevel() * levelBonus + GetStat(STAT_STRENGTH) * 2.0f - 20.0f + weaponBonus + m_baseFeralAP; + val2 = GetLevel() * levelBonus + GetStat(STAT_STRENGTH) * 2.0f - 20.0f + weaponBonus + m_baseFeralAP; break; case FORM_MOONKIN: val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f + m_baseFeralAP; @@ -462,7 +462,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) //add dynamic flat mods if (ranged) { - if ((getClassMask() & CLASSMASK_WAND_USERS) == 0) + if ((GetClassMask() & CLASSMASK_WAND_USERS) == 0) { AuraEffectList const& mRAPbyStat = GetAuraEffectsByType(SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT); for (AuraEffect const* aurEff : mRAPbyStat) @@ -499,7 +499,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) UpdateDamagePhysical(BASE_ATTACK); if (CanDualWield() && haveOffhandWeapon()) //allow update offhand damage only if player knows DualWield Spec and has equipped offhand weapon UpdateDamagePhysical(OFF_ATTACK); - if (getClass() == CLASS_SHAMAN || getClass() == CLASS_PALADIN) // mental quickness + if (GetClass() == CLASS_SHAMAN || GetClass() == CLASS_PALADIN) // mental quickness UpdateSpellDamageAndHealingBonus(); if (pet && (pet->IsPetGhoul() || pet->IsRisenAlly())) // At melee attack power change for DK pet @@ -562,7 +562,7 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo // check if player is druid and in cat or bear forms if (IsInFeralForm()) { - uint8 lvl = getLevel(); + uint8 lvl = GetLevel(); if (lvl > 60) lvl = 60; @@ -735,7 +735,7 @@ float Player::GetMissPercentageFromDefense() const diminishing += (GetRatingBonusValue(CR_DEFENSE_SKILL) * 0.04f); // apply diminishing formula to diminishing miss chance - return CalculateDiminishingReturns(miss_cap, getClass(), nondiminishing, diminishing); + return CalculateDiminishingReturns(miss_cap, GetClass(), nondiminishing, diminishing); } float const parry_cap[MAX_CLASSES] = @@ -757,7 +757,7 @@ void Player::UpdateParryPercentage() { // No parry float value = 0.0f; - uint32 pclass = getClass() - 1; + uint32 pclass = GetClass() - 1; if (CanParry() && parry_cap[pclass] > 0.0f) { float nondiminishing = 5.0f; @@ -770,7 +770,7 @@ void Player::UpdateParryPercentage() nondiminishing += GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT); // apply diminishing formula to diminishing parry chance - value = CalculateDiminishingReturns(parry_cap, getClass(), nondiminishing, diminishing); + value = CalculateDiminishingReturns(parry_cap, GetClass(), nondiminishing, diminishing); if (sWorld->getBoolConfig(CONFIG_STATS_LIMITS_ENABLE)) value = value > sWorld->getFloatConfig(CONFIG_STATS_LIMITS_PARRY) ? sWorld->getFloatConfig(CONFIG_STATS_LIMITS_PARRY) : value; @@ -808,7 +808,7 @@ void Player::UpdateDodgePercentage() diminishing += GetRatingBonusValue(CR_DODGE); // apply diminishing formula to diminishing dodge chance - float value = CalculateDiminishingReturns(dodge_cap, getClass(), nondiminishing, diminishing); + float value = CalculateDiminishingReturns(dodge_cap, GetClass(), nondiminishing, diminishing); if (sWorld->getBoolConfig(CONFIG_STATS_LIMITS_ENABLE)) value = value > sWorld->getFloatConfig(CONFIG_STATS_LIMITS_DODGE) ? sWorld->getFloatConfig(CONFIG_STATS_LIMITS_DODGE) : value; @@ -1183,7 +1183,7 @@ bool Guardian::UpdateStats(Stats stat) } else if (stat == STAT_STAMINA) { - if (owner->getClass() == CLASS_WARLOCK && IsPet()) + if (owner->GetClass() == CLASS_WARLOCK && IsPet()) { ownersBonus = CalculatePct(owner->GetStat(STAT_STAMINA), 75); value += ownersBonus; @@ -1210,7 +1210,7 @@ bool Guardian::UpdateStats(Stats stat) //warlock's and mage's pets gain 30% of owner's intellect else if (stat == STAT_INTELLECT) { - if (owner->getClass() == CLASS_WARLOCK || owner->getClass() == CLASS_MAGE) + if (owner->GetClass() == CLASS_WARLOCK || owner->GetClass() == CLASS_MAGE) { ownersBonus = CalculatePct(owner->GetStat(stat), 30); value += ownersBonus; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 22bddb2457b..d72e65d6b31 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1275,7 +1275,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, CalcDamageInfo* damageInfo, Weapon { damageInfo->HitInfo |= HITINFO_GLANCING; damageInfo->TargetState = VICTIMSTATE_HIT; - int32 leveldif = int32(victim->getLevel()) - int32(getLevel()); + int32 leveldif = int32(victim->GetLevel()) - int32(GetLevel()); if (leveldif > 3) leveldif = 3; @@ -1426,8 +1426,8 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) float chance = 20.0f; // there is a newbie protection, at level 10 just 7% base chance; assuming linear function - if (victim->getLevel() < 30) - chance = 0.65f * victim->getLevel() + 0.5f; + if (victim->GetLevel() < 30) + chance = 0.65f * victim->GetLevel() + 0.5f; uint32 const victimDefense = victim->GetDefenseSkillValue(); uint32 const attackerMeleeSkill = GetMaxSkillValueForLevel(); @@ -1556,10 +1556,10 @@ void Unit::HandleEmoteCommand(uint32 anim_id) RoundToInterval(arpPct, 0.f, 100.f); float maxArmorPen = 0.f; - if (victim->getLevel() < 60) - maxArmorPen = float(400 + 85 * victim->getLevel()); + if (victim->GetLevel() < 60) + maxArmorPen = float(400 + 85 * victim->GetLevel()); else - maxArmorPen = 400 + 85 * victim->getLevel() + 4.5f * 85 * (victim->getLevel() - 59); + maxArmorPen = 400 + 85 * victim->GetLevel() + 4.5f * 85 * (victim->GetLevel() - 59); // Cap armor penetration to this number maxArmorPen = std::min((armor + maxArmorPen) / 3.f, armor); @@ -1571,7 +1571,7 @@ void Unit::HandleEmoteCommand(uint32 anim_id) if (armor < 0.0f) armor = 0.0f; - float levelModifier = attacker ? attacker->getLevel() : attackerLevel; + float levelModifier = attacker ? attacker->GetLevel() : attackerLevel; if (levelModifier > 59.f) levelModifier = levelModifier + 4.5f * (levelModifier - 59.f); @@ -1683,11 +1683,11 @@ void Unit::HandleEmoteCommand(uint32 anim_id) // level-based resistance does not apply to binary spells, and cannot be overcome by spell penetration // gameobject caster -- should it have level based resistance? if (caster && caster->GetTypeId() != TYPEID_GAMEOBJECT && (!spellInfo || !spellInfo->HasAttribute(SPELL_ATTR0_CU_BINARY_SPELL))) - victimResistance += std::max((float(victim->getLevelForTarget(caster)) - float(caster->getLevelForTarget(victim))) * 5.0f, 0.0f); + victimResistance += std::max((float(victim->GetLevelForTarget(caster)) - float(caster->GetLevelForTarget(victim))) * 5.0f, 0.0f); static uint32 const BOSS_LEVEL = 83; static float const BOSS_RESISTANCE_CONSTANT = 510.0f; - uint32 level = victim->getLevel(); + uint32 level = victim->GetLevel(); float resistanceConstant = 0.0f; if (level == BOSS_LEVEL) @@ -2128,7 +2128,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy // Max 40% chance to score a glancing blow against mobs that are higher level (can do only players and pets and not with ranged weapon) if ((GetTypeId() == TYPEID_PLAYER || IsPet()) && victim->GetTypeId() != TYPEID_PLAYER && !victim->IsPet() && - getLevel() < victim->getLevelForTarget(this)) + GetLevel() < victim->GetLevelForTarget(this)) { // cap possible value (with bonuses > max skill) int32 skill = attackerWeaponSkill; @@ -2159,7 +2159,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy // 7. CRUSHING // mobs can score crushing blows if they're 4 or more levels above victim - if (getLevelForTarget(victim) >= victim->getLevelForTarget(this) + 4 && + if (GetLevelForTarget(victim) >= victim->GetLevelForTarget(this) + 4 && // can be from by creature (if can) or from controlled player that considered as creature !IsControlledByPlayer() && !(GetTypeId() == TYPEID_UNIT && ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRUSH)) @@ -2237,10 +2237,10 @@ uint32 Unit::CalculateDamage(WeaponAttackType attType, bool normalized, bool add float Unit::CalculateSpellpowerCoefficientLevelPenalty(SpellInfo const* spellInfo) const { - if (!spellInfo->MaxLevel || getLevel() < spellInfo->MaxLevel) + if (!spellInfo->MaxLevel || GetLevel() < spellInfo->MaxLevel) return 1.0f; - return std::max(0.0f, std::min(1.0f, (22.0f + spellInfo->MaxLevel - getLevel()) / 20.0f)); + return std::max(0.0f, std::min(1.0f, (22.0f + spellInfo->MaxLevel - GetLevel()) / 20.0f)); } void Unit::SendMeleeAttackStart(Unit* victim) @@ -5363,7 +5363,7 @@ void Unit::UpdateDisplayPower() { if (GetTypeId() == TYPEID_PLAYER) { - ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(getClass()); + ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(GetClass()); if (cEntry && cEntry->powerType < MAX_POWERS) displayPower = Powers(cEntry->powerType); } @@ -5373,7 +5373,7 @@ void Unit::UpdateDisplayPower() { if (PowerDisplayEntry const* powerDisplay = sPowerDisplayStore.LookupEntry(vehicle->GetVehicleInfo()->m_powerDisplayId)) displayPower = Powers(powerDisplay->PowerType); - else if (getClass() == CLASS_ROGUE) + else if (GetClass() == CLASS_ROGUE) displayPower = POWER_ENERGY; } else if (Pet* pet = ToPet()) @@ -6660,7 +6660,7 @@ float Unit::SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, Damage if (victim->HasAuraState(AURA_STATE_FROZEN, spellProto, this)) { // Glyph of Ice Lance - if (owner->HasAura(56377) && victim->getLevel() > owner->getLevel()) + if (owner->HasAura(56377) && victim->GetLevel() > owner->GetLevel()) DoneTotalMod *= 4.0f; else DoneTotalMod *= 3.0f; @@ -7068,7 +7068,7 @@ float Unit::SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo, // Spell crit suppression if (GetTypeId() == TYPEID_UNIT) { - int32 const levelDiff = static_cast<int32>(getLevelForTarget(caster)) - caster->getLevel(); + int32 const levelDiff = static_cast<int32>(GetLevelForTarget(caster)) - caster->GetLevel(); crit_chance -= levelDiff * 0.7f; } } @@ -9951,7 +9951,7 @@ void Unit::ProcSkillsAndReactives(bool isVictim, Unit* procTarget, uint32 typeMa if (hitMask & PROC_HIT_DODGE) { // Update AURA_STATE on dodge - if (getClass() != CLASS_ROGUE) // skip Rogue Riposte + if (GetClass() != CLASS_ROGUE) // skip Rogue Riposte { ModifyAuraState(AURA_STATE_DEFENSE, true); StartReactiveTimer(REACTIVE_DEFENSE); @@ -9961,7 +9961,7 @@ void Unit::ProcSkillsAndReactives(bool isVictim, Unit* procTarget, uint32 typeMa if (hitMask & PROC_HIT_PARRY) { // For Hunters only Counterattack (skip Mongoose bite) - if (getClass() == CLASS_HUNTER) + if (GetClass() == CLASS_HUNTER) { ModifyAuraState(AURA_STATE_HUNTER_PARRY, true); StartReactiveTimer(REACTIVE_HUNTER_PARRY); @@ -9982,7 +9982,7 @@ void Unit::ProcSkillsAndReactives(bool isVictim, Unit* procTarget, uint32 typeMa else // For attacker { // Overpower on victim dodge - if ((hitMask & PROC_HIT_DODGE) && GetTypeId() == TYPEID_PLAYER && getClass() == CLASS_WARRIOR) + if ((hitMask & PROC_HIT_DODGE) && GetTypeId() == TYPEID_PLAYER && GetClass() == CLASS_WARRIOR) { AddComboPoints(procTarget, 1); StartReactiveTimer(REACTIVE_OVERPOWER); @@ -10361,9 +10361,9 @@ void Unit::ClearAllReactives() if (HasAuraState(AURA_STATE_DEFENSE)) ModifyAuraState(AURA_STATE_DEFENSE, false); - if (getClass() == CLASS_HUNTER && HasAuraState(AURA_STATE_HUNTER_PARRY)) + if (GetClass() == CLASS_HUNTER && HasAuraState(AURA_STATE_HUNTER_PARRY)) ModifyAuraState(AURA_STATE_HUNTER_PARRY, false); - if (getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER) + if (GetClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER) ClearComboPoints(); if (IsHunterPet()) ClearComboPoints(); @@ -10389,11 +10389,11 @@ void Unit::UpdateReactives(uint32 p_time) ModifyAuraState(AURA_STATE_DEFENSE, false); break; case REACTIVE_HUNTER_PARRY: - if (getClass() == CLASS_HUNTER && HasAuraState(AURA_STATE_HUNTER_PARRY)) + if (GetClass() == CLASS_HUNTER && HasAuraState(AURA_STATE_HUNTER_PARRY)) ModifyAuraState(AURA_STATE_HUNTER_PARRY, false); break; case REACTIVE_OVERPOWER: - if (getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER) + if (GetClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER) ClearComboPoints(); break; case REACTIVE_WOLVERINE_BITE: @@ -10688,7 +10688,7 @@ Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id) return nullptr; } - uint8 level = creatureTarget->getLevel() + 5 < getLevel() ? (getLevel() - 5) : creatureTarget->getLevel(); + uint8 level = creatureTarget->GetLevel() + 5 < GetLevel() ? (GetLevel() - 5) : creatureTarget->GetLevel(); InitTamedPet(pet, level, spell_id); @@ -10706,7 +10706,7 @@ Pet* Unit::CreateTamedPetFrom(uint32 creatureEntry, uint32 spell_id) Pet* pet = new Pet(ToPlayer(), HUNTER_PET); - if (!pet->CreateBaseAtCreatureInfo(creatureInfo, this) || !InitTamedPet(pet, getLevel(), spell_id)) + if (!pet->CreateBaseAtCreatureInfo(creatureInfo, this) || !InitTamedPet(pet, GetLevel(), spell_id)) { delete pet; return nullptr; @@ -11440,7 +11440,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au AddUnitState(UNIT_STATE_POSSESSED); break; case CHARM_TYPE_CHARM: - if (GetTypeId() == TYPEID_UNIT && charmer->getClass() == CLASS_WARLOCK) + if (GetTypeId() == TYPEID_UNIT && charmer->GetClass() == CLASS_WARLOCK) { CreatureTemplate const* cinfo = ToCreature()->GetCreatureTemplate(); if (cinfo && cinfo->type == CREATURE_TYPE_DEMON) @@ -11538,7 +11538,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_POSSESSED); break; case CHARM_TYPE_CHARM: - if (GetTypeId() == TYPEID_UNIT && charmer->getClass() == CLASS_WARLOCK) + if (GetTypeId() == TYPEID_UNIT && charmer->GetClass() == CLASS_WARLOCK) { CreatureTemplate const* cinfo = ToCreature()->GetCreatureTemplate(); if (cinfo && cinfo->type == CREATURE_TYPE_DEMON) @@ -11581,7 +11581,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) void Unit::RestoreFaction() { if (GetTypeId() == TYPEID_PLAYER) - ToPlayer()->setFactionForRace(getRace()); + ToPlayer()->setFactionForRace(GetRace()); else { if (HasUnitTypeMask(UNIT_MASK_MINION)) @@ -11915,7 +11915,7 @@ float Unit::MeleeSpellMissChance(Unit const* victim, WeaponAttackType attType, i else { missChance += diff > 10 ? 1 + (diff - 10) * 0.4f : diff * 0.1f; - float levelFactor = victim->getLevelForTarget(this); + float levelFactor = victim->GetLevelForTarget(this); if (levelFactor < 10.f) missChance *= (levelFactor / 10.f); } @@ -12058,7 +12058,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const { case FORM_CAT: // Based on Hair color - if (getRace() == RACE_NIGHTELF) + if (GetRace() == RACE_NIGHTELF) { uint8 hairColor = GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_HAIR_COLOR_ID); switch (hairColor) @@ -12079,11 +12079,11 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const } } // Based on Skin color - else if (getRace() == RACE_TAUREN) + else if (GetRace() == RACE_TAUREN) { uint8 skinColor = GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_SKIN_ID); // Male - if (getGender() == GENDER_MALE) + if (GetGender() == GENDER_MALE) { switch (skinColor) { @@ -12131,14 +12131,14 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const return 8571; } } - else if (Player::TeamForRace(getRace()) == ALLIANCE) + else if (Player::TeamForRace(GetRace()) == ALLIANCE) return 892; else return 8571; case FORM_DIREBEAR: case FORM_BEAR: // Based on Hair color - if (getRace() == RACE_NIGHTELF) + if (GetRace() == RACE_NIGHTELF) { uint8 hairColor = GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_HAIR_COLOR_ID); switch (hairColor) @@ -12158,11 +12158,11 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const } } // Based on Skin color - else if (getRace() == RACE_TAUREN) + else if (GetRace() == RACE_TAUREN) { uint8 skinColor = GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_SKIN_ID); // Male - if (getGender() == GENDER_MALE) + if (GetGender() == GENDER_MALE) { switch (skinColor) { @@ -12210,16 +12210,16 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const return 2289; } } - else if (Player::TeamForRace(getRace()) == ALLIANCE) + else if (Player::TeamForRace(GetRace()) == ALLIANCE) return 2281; else return 2289; case FORM_FLIGHT: - if (Player::TeamForRace(getRace()) == ALLIANCE) + if (Player::TeamForRace(GetRace()) == ALLIANCE) return 20857; return 20872; case FORM_FLIGHT_EPIC: - if (Player::TeamForRace(getRace()) == ALLIANCE) + if (Player::TeamForRace(GetRace()) == ALLIANCE) return 21243; return 21244; default: @@ -12236,13 +12236,13 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const return formEntry->modelID_A; else { - if (Player::TeamForRace(getRace()) == ALLIANCE) + if (Player::TeamForRace(GetRace()) == ALLIANCE) modelid = formEntry->modelID_A; else modelid = formEntry->modelID_H; // If the player is horde but there are no values for the horde modelid - take the alliance modelid - if (!modelid && Player::TeamForRace(getRace()) == HORDE) + if (!modelid && Player::TeamForRace(GetRace()) == HORDE) modelid = formEntry->modelID_A; } } @@ -12252,7 +12252,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const uint32 Unit::GetModelForTotem(PlayerTotemType totemType) { - switch (getRace()) + switch (GetRace()) { case RACE_ORC: { @@ -12818,11 +12818,11 @@ void Unit::RewardRage(uint32 damage, uint32 weaponSpeedHitFactor, bool attacker) { float addRage; - float rageconversion = ((0.0091107836f * getLevel() * getLevel()) + 3.225598133f * getLevel()) + 4.2652911f; + float rageconversion = ((0.0091107836f * GetLevel() * GetLevel()) + 3.225598133f * GetLevel()) + 4.2652911f; // Unknown if correct, but lineary adjust rage conversion above level 70 - if (getLevel() > 70) - rageconversion += 13.27f * (getLevel() - 70); + if (GetLevel() > 70) + rageconversion += 13.27f * (GetLevel() - 70); if (attacker) { @@ -13430,7 +13430,7 @@ void Unit::Talk(uint32 textId, ChatMsg msgType, float textRange, WorldObject con return; } - Trinity::BroadcastTextBuilder builder(this, msgType, textId, getGender(), target); + Trinity::BroadcastTextBuilder builder(this, msgType, textId, GetGender(), target); Trinity::LocalizedPacketDo<Trinity::BroadcastTextBuilder> localizer(builder); Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::BroadcastTextBuilder> > worker(this, textRange, localizer); Cell::VisitWorldObjects(this, worker, textRange); @@ -13465,7 +13465,7 @@ void Unit::Whisper(uint32 textId, Player* target, bool isBossWhisper /*= false*/ LocaleConstant locale = target->GetSession()->GetSessionDbLocaleIndex(); WorldPacket data; - ChatHandler::BuildChatPacket(data, isBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, getGender()), 0, "", locale); + ChatHandler::BuildChatPacket(data, isBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, GetGender()), 0, "", locale); target->SendDirectMessage(&data); } @@ -13503,6 +13503,6 @@ std::string Unit::GetDebugInfo() const << std::boolalpha << "IsAIEnabled: " << IsAIEnabled() << " DeathState: " << std::to_string(getDeathState()) << " UnitMovementFlags: " << GetUnitMovementFlags() << " ExtraUnitMovementFlags: " << GetExtraUnitMovementFlags() - << " Class: " << std::to_string(getClass()); + << " Class: " << std::to_string(GetClass()); return sstr.str(); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 557de4a2b89..0d20b9f7603 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -847,14 +847,14 @@ class TC_GAME_API Unit : public WorldObject bool IsTotem() const { return (m_unitTypeMask & UNIT_MASK_TOTEM) != 0; } bool IsVehicle() const { return (m_unitTypeMask & UNIT_MASK_VEHICLE) != 0; } - uint8 getLevel() const { return uint8(GetUInt32Value(UNIT_FIELD_LEVEL)); } - uint8 getLevelForTarget(WorldObject const* /*target*/) const override { return getLevel(); } + uint8 GetLevel() const { return uint8(GetUInt32Value(UNIT_FIELD_LEVEL)); } + uint8 GetLevelForTarget(WorldObject const* /*target*/) const override { return GetLevel(); } void SetLevel(uint8 lvl); - uint8 getRace() const { return GetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_RACE); } - uint32 getRaceMask() const { return 1 << (getRace()-1); } - uint8 getClass() const { return GetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_CLASS); } - uint32 getClassMask() const { return 1 << (getClass()-1); } - uint8 getGender() const { return GetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_GENDER); } + uint8 GetRace() const { return GetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_RACE); } + uint32 GetRaceMask() const { return 1 << (GetRace() - 1); } + uint8 GetClass() const { return GetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_CLASS); } + uint32 GetClassMask() const { return 1 << (GetClass() - 1); } + uint8 GetGender() const { return GetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_GENDER); } float GetStat(Stats stat) const { return float(GetUInt32Value(UNIT_FIELD_STAT0+stat)); } void SetStat(Stats stat, int32 val) { SetStatInt32Value(UNIT_FIELD_STAT0+stat, val); } @@ -932,7 +932,7 @@ class TC_GAME_API Unit : public WorldObject void Mount(uint32 mount, uint32 vehicleId = 0, uint32 creatureEntry = 0); void Dismount(); - uint32 GetMaxSkillValueForLevel(Unit const* target = nullptr) const { return (target ? getLevelForTarget(target) : getLevel()) * 5; } + uint32 GetMaxSkillValueForLevel(Unit const* target = nullptr) const { return (target ? GetLevelForTarget(target) : GetLevel()) * 5; } static void DealDamageMods(Unit const* victim, uint32& damage, uint32* absorb); static uint32 DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage const* cleanDamage = nullptr, DamageEffectType damagetype = DIRECT_DAMAGE, SpellSchoolMask damageSchoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellInfo const* spellProto = nullptr, bool durabilityLoss = true); static void Kill(Unit* attacker, Unit* victim, bool durabilityLoss = true); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 2aeab843bf3..4bed2f71a16 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -467,7 +467,7 @@ bool Group::AddMember(Player* player) player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, false); player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, true); - if (player->getLevel() >= LEVELREQUIREMENT_HEROIC) + if (player->GetLevel() >= LEVELREQUIREMENT_HEROIC) { if (player->GetDungeonDifficulty() != GetDungeonDifficulty()) { @@ -1979,7 +1979,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* if (!reference) return ERR_BATTLEGROUND_JOIN_FAILED; - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgOrTemplate->GetMapId(), reference->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgOrTemplate->GetMapId(), reference->GetLevel()); if (!bracketEntry) return ERR_BATTLEGROUND_JOIN_FAILED; @@ -2000,7 +2000,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* if (member->GetTeam() != team) return ERR_BATTLEGROUND_JOIN_TIMED_OUT; // not in the same battleground level braket, don't let join - PvPDifficultyEntry const* memberBracketEntry = GetBattlegroundBracketByLevel(bracketEntry->mapId, member->getLevel()); + PvPDifficultyEntry const* memberBracketEntry = GetBattlegroundBracketByLevel(bracketEntry->mapId, member->GetLevel()); if (memberBracketEntry != bracketEntry) return ERR_BATTLEGROUND_JOIN_RANGE_INDEX; // don't let join rated matches if the arena team id doesn't match diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index d6d91467795..7748e8d9752 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -626,9 +626,9 @@ Guild::Member::Member(ObjectGuid::LowType guildId, ObjectGuid guid, uint8 rankId void Guild::Member::SetStats(Player* player) { m_name = player->GetName(); - m_level = player->getLevel(); - m_class = player->getClass(); - m_gender = player->getGender(); + m_level = player->GetLevel(); + m_class = player->GetClass(); + m_gender = player->GetGender(); m_zoneId = player->GetZoneId(); m_accountId = player->GetSession()->GetAccountId(); } diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index 1d5b5fa099e..93f07e7231f 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -109,7 +109,7 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recvData) return; } - if (player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (player->GetLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", player->GetName(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S); return; diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 5f7ef0643bf..148b678508b 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -59,7 +59,7 @@ void WorldSession::HandleAuctionHelloOpcode(WorldPacket& recvData) //this void causes that auction window is opened void WorldSession::SendAuctionHello(ObjectGuid guid, Creature* unit) { - if (GetPlayer()->getLevel() < sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ)) + if (GetPlayer()->GetLevel() < sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_AUCTION_REQ), sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ)); return; diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index f510a31d204..7733321f9b1 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -121,7 +121,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData) return; // expected bracket entry - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->GetLevel()); if (!bracketEntry) return; @@ -411,7 +411,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recvData) GetPlayerInfo().c_str(), type, unk2, bgTypeId_, action); // expected bracket entry - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->GetLevel()); if (!bracketEntry) return; @@ -429,10 +429,10 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recvData) TC_LOG_DEBUG("bg.battleground", "Player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName().c_str(), _player->GetGUID().GetCounter()); } //if player don't match battleground max level, then do not allow him to enter! (this might happen when player leveled up during his waiting in queue - if (_player->getLevel() > bg->GetMaxLevel()) + if (_player->GetLevel() > bg->GetMaxLevel()) { TC_LOG_ERROR("network", "Player %s (%u) has level (%u) higher than maxlevel (%u) of battleground (%u)! Do not port him to battleground!", - _player->GetName().c_str(), _player->GetGUID().GetCounter(), _player->getLevel(), bg->GetMaxLevel(), bg->GetTypeID()); + _player->GetName().c_str(), _player->GetGUID().GetCounter(), _player->GetLevel(), bg->GetMaxLevel(), bg->GetTypeID()); action = 0; } } @@ -587,7 +587,7 @@ void WorldSession::HandleBattlefieldStatusOpcode(WorldPacket & /*recvData*/) continue; // expected bracket entry - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->GetLevel()); if (!bracketEntry) continue; @@ -655,7 +655,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData) BattlegroundTypeId bgTypeId = bg->GetTypeID(); BattlegroundQueueTypeId bgQueueTypeId = BattlegroundMgr::BGQueueTypeId(bgTypeId, arenatype); - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->GetLevel()); if (!bracketEntry) return; diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index adcb3421ccf..a5df85fbcbc 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -595,7 +595,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket& recvData) TC_LOG_INFO("entities.player.character", "Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), createInfo->Name.c_str(), newChar.GetGUID().GetCounter()); sScriptMgr->OnPlayerCreate(&newChar); - sCharacterCache->AddCharacterCacheEntry(newChar.GetGUID(), GetAccountId(), newChar.GetName(), newChar.GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), newChar.getRace(), newChar.getClass(), newChar.getLevel()); + sCharacterCache->AddCharacterCacheEntry(newChar.GetGUID(), GetAccountId(), newChar.GetName(), newChar.GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), newChar.GetRace(), newChar.GetClass(), newChar.GetLevel()); newChar.CleanupsBeforeDelete(); }; @@ -801,11 +801,11 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) { pCurrChar->setCinematic(1); - if (ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(pCurrChar->getClass())) + if (ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(pCurrChar->GetClass())) { if (cEntry->CinematicSequence) pCurrChar->SendCinematicStart(cEntry->CinematicSequence); - else if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(pCurrChar->getRace())) + else if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(pCurrChar->GetRace())) pCurrChar->SendCinematicStart(rEntry->CinematicSequence); // send new char string if not empty @@ -897,7 +897,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) { pCurrChar->RemoveAtLoginFlag(AT_LOGIN_FIRST); - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(pCurrChar->getRace(), pCurrChar->getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(pCurrChar->GetRace(), pCurrChar->GetClass()); for (uint32 spellId : info->castSpells) pCurrChar->CastSpell(pCurrChar, spellId, true); @@ -983,7 +983,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) std::string IP_str = GetRemoteAddress(); TC_LOG_INFO("entities.player.character", "Account: %d (IP: %s) Login Character:[%s] (GUID: %u) Level: %d", - GetAccountId(), IP_str.c_str(), pCurrChar->GetName().c_str(), pCurrChar->GetGUID().GetCounter(), pCurrChar->getLevel()); + GetAccountId(), IP_str.c_str(), pCurrChar->GetName().c_str(), pCurrChar->GetGUID().GetCounter(), pCurrChar->GetLevel()); if (!pCurrChar->IsStandState() && !pCurrChar->HasUnitState(UNIT_STATE_STUNNED)) pCurrChar->SetStandState(UNIT_STAND_STATE_STAND); @@ -1259,20 +1259,20 @@ void WorldSession::HandleAlterAppearance(WorldPacket& recvData) BarberShopStyleEntry const* bs_hair = sBarberShopStyleStore.LookupEntry(Hair); - if (!bs_hair || bs_hair->type != 0 || bs_hair->race != _player->getRace() || bs_hair->gender != _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER)) + if (!bs_hair || bs_hair->type != 0 || bs_hair->race != _player->GetRace() || bs_hair->gender != _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER)) return; BarberShopStyleEntry const* bs_facialHair = sBarberShopStyleStore.LookupEntry(FacialHair); - if (!bs_facialHair || bs_facialHair->type != 2 || bs_facialHair->race != _player->getRace() || bs_facialHair->gender != _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER)) + if (!bs_facialHair || bs_facialHair->type != 2 || bs_facialHair->race != _player->GetRace() || bs_facialHair->gender != _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER)) return; BarberShopStyleEntry const* bs_skinColor = sBarberShopStyleStore.LookupEntry(SkinColor); - if (bs_skinColor && (bs_skinColor->type != 3 || bs_skinColor->race != _player->getRace() || bs_skinColor->gender != _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER))) + if (bs_skinColor && (bs_skinColor->type != 3 || bs_skinColor->race != _player->GetRace() || bs_skinColor->gender != _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER))) return; - if (!Player::ValidateAppearance(_player->getRace(), _player->getClass(), _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), + if (!Player::ValidateAppearance(_player->GetRace(), _player->GetClass(), _player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), bs_hair->hair_id, Color, _player->GetByteValue(PLAYER_BYTES, PLAYER_BYTES_OFFSET_FACE_ID), diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 095c8088232..bd1e730dfdd 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -287,7 +287,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) if (!sender->IsAlive()) return; - if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_SAY_LEVEL_REQ)) + if (sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_SAY_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_SAY_REQ), sWorld->getIntConfig(CONFIG_CHAT_SAY_LEVEL_REQ)); return; @@ -302,7 +302,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) if (!sender->IsAlive()) return; - if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_EMOTE_LEVEL_REQ)) + if (sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_EMOTE_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_SAY_REQ), sWorld->getIntConfig(CONFIG_CHAT_EMOTE_LEVEL_REQ)); return; @@ -317,7 +317,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) if (!sender->IsAlive()) return; - if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_YELL_LEVEL_REQ)) + if (sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_YELL_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_SAY_REQ), sWorld->getIntConfig(CONFIG_CHAT_YELL_LEVEL_REQ)); return; @@ -344,7 +344,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) // Apply checks only if receiver is not already in whitelist and if receiver is not a GM with ".whisper on" if (!receiver->IsInWhisperWhiteList(sender->GetGUID()) && !receiver->IsGameMasterAcceptingWhispers()) { - if (!sender->IsGameMaster() && sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)) + if (!sender->IsGameMaster() && sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); return; @@ -365,7 +365,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) // If player is a Gamemaster and doesn't accept whisper, we auto-whitelist every player that the Gamemaster is talking to // We also do that if a player is under the required level for whispers. - if (receiver->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) || + if (receiver->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) || (HasPermission(rbac::RBAC_PERM_CAN_FILTER_WHISPERS) && !sender->isAcceptWhispers() && !sender->IsInWhisperWhiteList(receiver->GetGUID()))) sender->AddWhisperWhiteList(receiver->GetGUID()); @@ -502,7 +502,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) { if (!HasPermission(rbac::RBAC_PERM_SKIP_CHECK_CHAT_CHANNEL_REQ)) { - if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_CHANNEL_LEVEL_REQ)) + if (sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_CHANNEL_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_CHANNEL_REQ), sWorld->getIntConfig(CONFIG_CHAT_CHANNEL_LEVEL_REQ)); return; diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 36b1572cb28..77aa0053e8a 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -123,7 +123,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData) return; } - if (!invitedPlayer->GetSocial()->HasFriend(invitingPlayer->GetGUID()) && invitingPlayer->getLevel() < sWorld->getIntConfig(CONFIG_PARTY_LEVEL_REQ)) + if (!invitedPlayer->GetSocial()->HasFriend(invitingPlayer->GetGUID()) && invitingPlayer->GetLevel() < sWorld->getIntConfig(CONFIG_PARTY_LEVEL_REQ)) { SendPartyResult(PARTY_OP_INVITE, membername, ERR_INVITE_RESTRICTED); return; @@ -795,7 +795,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke *data << uint16(player->GetMaxPower(powerType)); if (mask & GROUP_UPDATE_FLAG_LEVEL) - *data << uint16(player->getLevel()); + *data << uint16(player->GetLevel()); if (mask & GROUP_UPDATE_FLAG_ZONE) *data << uint16(player->GetZoneId()); @@ -986,7 +986,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData) data << uint16(player->GetPower(powerType)); // GROUP_UPDATE_FLAG_CUR_POWER data << uint16(player->GetMaxPower(powerType)); // GROUP_UPDATE_FLAG_MAX_POWER - data << uint16(player->getLevel()); // GROUP_UPDATE_FLAG_LEVEL + data << uint16(player->GetLevel()); // GROUP_UPDATE_FLAG_LEVEL data << uint16(player->GetZoneId()); // GROUP_UPDATE_FLAG_ZONE data << uint16(player->GetPositionX()); // GROUP_UPDATE_FLAG_POSITION data << uint16(player->GetPositionY()); // GROUP_UPDATE_FLAG_POSITION diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 126d71b35df..4d4621fe342 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -652,7 +652,7 @@ void WorldSession::SendListInventory(ObjectGuid 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. diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index b46e44d7b34..651f77b5477 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -172,7 +172,7 @@ void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData* GetPlayerInfo().c_str()); // Get Random dungeons that can be done at a certain level and expansion - uint8 level = GetPlayer()->getLevel(); + uint8 level = GetPlayer()->GetLevel(); lfg::LfgDungeonSet const& randomDungeons = sLFGMgr->GetRandomAndSeasonalDungeons(level, GetPlayer()->GetSession()->Expansion()); @@ -430,7 +430,7 @@ void WorldSession::SendLfgRoleCheckUpdate(lfg::LfgRoleCheck const& roleCheck) data << uint8(roles > 0); // Ready data << uint32(roles); // Roles Player* player = ObjectAccessor::FindConnectedPlayer(guid); - data << uint8(player ? player->getLevel() : 0); // Level + data << uint8(player ? player->GetLevel() : 0); // Level for (lfg::LfgRolesMap::const_iterator it = roleCheck.roles.begin(); it != roleCheck.roles.end(); ++it) { @@ -443,7 +443,7 @@ void WorldSession::SendLfgRoleCheckUpdate(lfg::LfgRoleCheck const& roleCheck) data << uint8(roles > 0); // Ready data << uint32(roles); // Roles player = ObjectAccessor::FindConnectedPlayer(guid); - data << uint8(player ? player->getLevel() : 0);// Level + data << uint8(player ? player->GetLevel() : 0);// Level } } SendPacket(&data); diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index 557cab0cb4e..b0db545448e 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -82,7 +82,7 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData) { Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid); - bool lootAllowed = creature && creature->IsAlive() == (player->getClass() == CLASS_ROGUE && creature->loot.loot_type == LOOT_PICKPOCKETING); + bool lootAllowed = creature && creature->IsAlive() == (player->GetClass() == CLASS_ROGUE && creature->loot.loot_type == LOOT_PICKPOCKETING); if (!lootAllowed || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) { player->SendLootError(lguid, lootAllowed ? LOOT_ERROR_TOO_FAR : LOOT_ERROR_DIDNT_KILL); @@ -148,7 +148,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recvData*/) case HighGuid::Vehicle: { Creature* creature = player->GetMap()->GetCreature(guid); - bool lootAllowed = creature && creature->IsAlive() == (player->getClass() == CLASS_ROGUE && creature->loot.loot_type == LOOT_PICKPOCKETING); + bool lootAllowed = creature && creature->IsAlive() == (player->GetClass() == CLASS_ROGUE && creature->loot.loot_type == LOOT_PICKPOCKETING); if (lootAllowed && creature->IsWithinDistInMap(player, INTERACTION_DISTANCE)) { loot = &creature->loot; @@ -350,7 +350,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid) { Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid); - bool lootAllowed = creature && creature->IsAlive() == (player->getClass() == CLASS_ROGUE && creature->loot.loot_type == LOOT_PICKPOCKETING); + bool lootAllowed = creature && creature->IsAlive() == (player->GetClass() == CLASS_ROGUE && creature->loot.loot_type == LOOT_PICKPOCKETING); if (!lootAllowed || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 1290f045f70..dd7de5ec9c9 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -99,7 +99,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) Player* player = _player; - if (player->getLevel() < sWorld->getIntConfig(CONFIG_MAIL_LEVEL_REQ)) + if (player->GetLevel() < sWorld->getIntConfig(CONFIG_MAIL_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_MAIL_SENDER_REQ), sWorld->getIntConfig(CONFIG_MAIL_LEVEL_REQ)); return; @@ -158,7 +158,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) { receiverTeam = receiver->GetTeam(); mailsCount = receiver->GetMailSize(); - receiverLevel = receiver->getLevel(); + receiverLevel = receiver->GetLevel(); receiverAccountId = receiver->GetSession()->GetAccountId(); } else diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index ad3260233d5..1885d58bcc0 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -367,7 +367,7 @@ void WorldSession::SendStablePetCallback(ObjectGuid guid, PreparedQueryResult re { data << uint32(pet->GetCharmInfo()->GetPetNumber()); data << uint32(pet->GetEntry()); - data << uint32(pet->getLevel()); + data << uint32(pet->GetLevel()); data << pet->GetName(); // petname data << uint8(1); // 1 = current, 2/3 = in stable (any from 4, 5, ... create problems with proper show) ++num; diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index ad34f505aa9..b9a38f95bce 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -108,7 +108,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) else { /// @todo find correct opcode - if (_player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (_player->GetLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", _player->GetName(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S); return; @@ -417,7 +417,7 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) if (type != GUILD_CHARTER_TYPE) { - if (_player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (_player->GetLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", _player->GetName(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S); return; @@ -545,7 +545,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) if (type != GUILD_CHARTER_TYPE) { - if (player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (player->GetLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { // player is too low level to join an arena team SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName(), "", ERR_ARENA_TEAM_TARGET_TOO_LOW_S); diff --git a/src/server/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp index 0ac2ff9142b..68ea0024d1d 100644 --- a/src/server/game/Handlers/ReferAFriendHandler.cpp +++ b/src/server/game/Handlers/ReferAFriendHandler.cpp @@ -41,9 +41,9 @@ void WorldSession::HandleGrantLevel(WorldPacket& recvData) error = ERR_REFER_A_FRIEND_NOT_REFERRED_BY; else if (target->GetTeamId() != _player->GetTeamId()) error = ERR_REFER_A_FRIEND_DIFFERENT_FACTION; - else if (target->getLevel() >= _player->getLevel()) + else if (target->GetLevel() >= _player->GetLevel()) error = ERR_REFER_A_FRIEND_TARGET_TOO_HIGH; - else if (target->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL)) + else if (target->GetLevel() >= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL)) error = ERR_REFER_A_FRIEND_GRANT_LEVEL_MAX_I; else if (target->GetGroup() != _player->GetGroup()) error = ERR_REFER_A_FRIEND_NOT_IN_GROUP; @@ -84,5 +84,5 @@ void WorldSession::HandleAcceptGrantLevel(WorldPacket& recvData) else return; - _player->GiveLevel(_player->getLevel() + 1); + _player->GiveLevel(_player->GetLevel() + 1); } diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp index 9f950e28539..701840a584b 100644 --- a/src/server/game/Handlers/SkillHandler.cpp +++ b/src/server/game/Handlers/SkillHandler.cpp @@ -96,7 +96,7 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket& recvData) uint32 skillId; recvData >> skillId; - SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skillId, GetPlayer()->getRace(), GetPlayer()->getClass()); + SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skillId, GetPlayer()->GetRace(), GetPlayer()->GetClass()); if (!rcEntry || !(rcEntry->Flags & SKILL_FLAG_UNLEARNABLE)) return; diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 0e349c1732f..39c40dbc47d 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -423,7 +423,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) if (spellInfo->IsPositive()) if (Unit* target = targets.GetUnitTarget()) { - SpellInfo const* actualSpellInfo = spellInfo->GetAuraRankForLevel(target->getLevel()); + SpellInfo const* actualSpellInfo = spellInfo->GetAuraRankForLevel(target->GetLevel()); // if rank not found then function return NULL but in explicit cast case original spell can be cast and later failed with appropriate error message if (actualSpellInfo) @@ -632,9 +632,9 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPacket& recvData) WorldPacket data(SMSG_MIRRORIMAGE_DATA, 68); data << uint64(guid); data << uint32(creator->GetDisplayId()); - data << uint8(creator->getRace()); - data << uint8(creator->getGender()); - data << uint8(creator->getClass()); + data << uint8(creator->GetRace()); + data << uint8(creator->GetGender()); + data << uint8(creator->GetClass()); if (creator->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp index aeee969d855..cc44c56b340 100644 --- a/src/server/game/Handlers/TicketHandler.cpp +++ b/src/server/game/Handlers/TicketHandler.cpp @@ -38,7 +38,7 @@ void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recvData) if (sTicketMgr->GetStatus() == GMTICKET_QUEUE_STATUS_DISABLED) return; - if (GetPlayer()->getLevel() < sWorld->getIntConfig(CONFIG_TICKET_LEVEL_REQ)) + if (GetPlayer()->GetLevel() < sWorld->getIntConfig(CONFIG_TICKET_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_TICKET_REQ), sWorld->getIntConfig(CONFIG_TICKET_LEVEL_REQ)); return; diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 4abc5b269dd..4758aef58b1 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -625,7 +625,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (GetPlayer()->getLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) + if (GetPlayer()->GetLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_TRADE_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); return; @@ -698,7 +698,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (pOther->getLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) + if (pOther->GetLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_TRADE_OTHER_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); return; diff --git a/src/server/game/Miscellaneous/CommonHelpers.cpp b/src/server/game/Miscellaneous/CommonHelpers.cpp index 592a1db1db2..27f168dcebe 100644 --- a/src/server/game/Miscellaneous/CommonHelpers.cpp +++ b/src/server/game/Miscellaneous/CommonHelpers.cpp @@ -250,7 +250,7 @@ uint8 Trinity::Helpers::Entity::GetPlayerSpecialization(Player const* who) if (!who) return 0; - uint8 playerClass = who->getClass(); + uint8 playerClass = who->GetClass(); for (uint8 tier = 0; tier < MaximumSpecializationIconicSpells; ++tier) { for (uint8 tree = 0; tree < MAX_TALENT_TREES; ++tree) @@ -266,7 +266,7 @@ bool Trinity::Helpers::Entity::IsPlayerHealer(Player const* who) if (!who) return false; - switch (who->getClass()) + switch (who->GetClass()) { case CLASS_WARRIOR: case CLASS_HUNTER: @@ -292,7 +292,7 @@ bool Trinity::Helpers::Entity::IsPlayerRangedAttacker(Player const* who) if (!who) return false; - switch (who->getClass()) + switch (who->GetClass()) { case CLASS_WARRIOR: case CLASS_PALADIN: diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 0045adc7c22..dfb23756ed4 100644 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -178,7 +178,7 @@ namespace Trinity { float xpMod = 1.0f; - gain = BaseGain(player->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(u->GetMapId(), u->GetZoneId())); + gain = BaseGain(player->GetLevel(), u->GetLevel(), GetContentLevelsForMapAndZone(u->GetMapId(), u->GetZoneId())); if (gain && creature) { diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 684f1b37f56..8ba3eda1f65 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -203,12 +203,12 @@ uint32 Quest::XPValue(Player* player) const { if (player) { - int32 quest_level = (_level == -1 ? player->getLevel() : _level); + int32 quest_level = (_level == -1 ? player->GetLevel() : _level); QuestXPEntry const* xpentry = sQuestXPStore.LookupEntry(quest_level); if (!xpentry) return 0; - int32 diffFactor = 2 * (quest_level - player->getLevel()) + 20; + int32 diffFactor = 2 * (quest_level - player->GetLevel()) + 20; if (diffFactor < 1) diffFactor = 1; else if (diffFactor > 10) diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 09276848a4e..b565d31dd3d 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -85,8 +85,8 @@ int32 ReputationMgr::GetBaseReputation(FactionEntry const* factionEntry) const if (!factionEntry) return 0; - uint32 raceMask = _player->getRaceMask(); - uint32 classMask = _player->getClassMask(); + uint32 raceMask = _player->GetRaceMask(); + uint32 classMask = _player->GetClassMask(); for (int i=0; i < 4; i++) { if ((factionEntry->BaseRepRaceMask[i] & raceMask || @@ -139,8 +139,8 @@ uint32 ReputationMgr::GetDefaultStateFlags(FactionEntry const* factionEntry) con if (!factionEntry) return 0; - uint32 raceMask = _player->getRaceMask(); - uint32 classMask = _player->getClassMask(); + uint32 raceMask = _player->GetRaceMask(); + uint32 classMask = _player->GetClassMask(); for (int i=0; i < 4; i++) { if ((factionEntry->BaseRepRaceMask[i] & raceMask || @@ -412,7 +412,7 @@ void ReputationMgr::SetVisible(FactionTemplateEntry const*factionTemplateEntry) if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionTemplateEntry->faction)) // Never show factions of the opposing team - if (!(factionEntry->BaseRepRaceMask[1] & _player->getRaceMask() && factionEntry->BaseRepValue[1] == Reputation_Bottom)) + if (!(factionEntry->BaseRepRaceMask[1] & _player->GetRaceMask() && factionEntry->BaseRepValue[1] == Reputation_Bottom)) SetVisible(factionEntry); } diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index c8836c7704a..db3f970d019 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -572,7 +572,7 @@ void WorldSession::LogoutPlayer(bool save) // calls to GetMap in this case may cause crashes _player->CleanupsBeforeDelete(); TC_LOG_INFO("entities.player.character", "Account: %d (IP: %s) Logout Character:[%s] (GUID: %u) Level: %d", - GetAccountId(), GetRemoteAddress().c_str(), _player->GetName().c_str(), _player->GetGUID().GetCounter(), _player->getLevel()); + GetAccountId(), GetRemoteAddress().c_str(), _player->GetName().c_str(), _player->GetGUID().GetCounter(), _player->GetLevel()); if (Map* _map = _player->FindMap()) _map->RemovePlayerFromMap(_player, true); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index af2ee8bac37..8b2f15b67b4 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1789,7 +1789,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo if (!target->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) { target->SetShapeshiftForm(FORM_NONE); - if (target->getClass() == CLASS_DRUID) + if (target->GetClass() == CLASS_DRUID) { // Remove movement impairing effects also when shifting out target->RemoveAurasByShapeShift(); @@ -1855,7 +1855,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo else target->UpdateDisplayPower(); - if (target->getClass() == CLASS_DRUID) + if (target->GetClass() == CLASS_DRUID) { // Dash if (AuraEffect* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_INCREASE_SPEED, SPELLFAMILY_DRUID, 0, 0, 0x8)) @@ -1917,47 +1917,47 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, if (target->GetTypeId() != TYPEID_PLAYER) return; - switch (target->getRace()) + switch (target->GetRace()) { // Blood Elf case RACE_BLOODELF: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 17830 : 17829); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 17830 : 17829); break; // Orc case RACE_ORC: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10140 : 10139); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10140 : 10139); break; // Troll case RACE_TROLL: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10134 : 10135); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10134 : 10135); break; // Tauren case RACE_TAUREN: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10147 : 10136); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10147 : 10136); break; // Undead case RACE_UNDEAD_PLAYER: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10145 : 10146); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10145 : 10146); break; // Draenei case RACE_DRAENEI: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 17828 : 17827); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 17828 : 17827); break; // Dwarf case RACE_DWARF: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10142 : 10141); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10142 : 10141); break; // Gnome case RACE_GNOME: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10149 : 10148); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10149 : 10148); break; // Human case RACE_HUMAN: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10138 : 10137); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10138 : 10137); break; // Night Elf case RACE_NIGHTELF: - target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10144 : 10143); + target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10144 : 10143); break; default: break; @@ -1976,47 +1976,47 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, if (target->GetTypeId() != TYPEID_PLAYER) return; - switch (target->getRace()) + switch (target->GetRace()) { // Blood Elf case RACE_BLOODELF: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25032 : 25043); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25032 : 25043); break; // Orc case RACE_ORC: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25039 : 25050); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25039 : 25050); break; // Troll case RACE_TROLL: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25041 : 25052); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25041 : 25052); break; // Tauren case RACE_TAUREN: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25040 : 25051); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25040 : 25051); break; // Undead case RACE_UNDEAD_PLAYER: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25042 : 25053); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25042 : 25053); break; // Draenei case RACE_DRAENEI: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25033 : 25044); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25033 : 25044); break; // Dwarf case RACE_DWARF: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25034 : 25045); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25034 : 25045); break; // Gnome case RACE_GNOME: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25035 : 25046); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25035 : 25046); break; // Human case RACE_HUMAN: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25037 : 25048); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25037 : 25048); break; // Night Elf case RACE_NIGHTELF: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 25038 : 25049); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 25038 : 25049); break; default: break; @@ -2030,15 +2030,15 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, // Honor the Dead case 65386: case 65495: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 29203 : 29204); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 29203 : 29204); break; // Darkspear Pride case 75532: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 31737 : 31738); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 31737 : 31738); break; // Gnomeregan Pride case 75531: - target->SetDisplayId(target->getGender() == GENDER_MALE ? 31654 : 31655); + target->SetDisplayId(target->GetGender() == GENDER_MALE ? 31654 : 31655); break; default: break; @@ -4047,7 +4047,7 @@ void AuraEffect::HandleAuraModRangedAttackPower(AuraApplication const* aurApp, u Unit* target = aurApp->GetTarget(); - if ((target->getClassMask() & CLASSMASK_WAND_USERS) != 0) + if ((target->GetClassMask() & CLASSMASK_WAND_USERS) != 0) return; target->HandleStatFlatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(GetAmount()), apply); @@ -4077,7 +4077,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const* au Unit* target = aurApp->GetTarget(); - if ((target->getClassMask() & CLASSMASK_WAND_USERS) != 0) + if ((target->GetClassMask() & CLASSMASK_WAND_USERS) != 0) return; //UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER = multiplier - 1 @@ -4098,7 +4098,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication con Unit* target = aurApp->GetTarget(); // Recalculate bonus - if (target->GetTypeId() == TYPEID_PLAYER && !(target->getClassMask() & CLASSMASK_WAND_USERS)) + if (target->GetTypeId() == TYPEID_PLAYER && !(target->GetClassMask() & CLASSMASK_WAND_USERS)) target->ToPlayer()->UpdateAttackPowerAndDamage(true); } @@ -4358,7 +4358,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (caster) { - if (caster->getGender() == GENDER_FEMALE) + if (caster->GetGender() == GENDER_FEMALE) caster->CastSpell(target, 37095, this); // Blood Elf Disguise else caster->CastSpell(target, 37093, this); @@ -4391,7 +4391,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 46354: // Blood Elf Illusion if (caster) { - if (caster->getGender() == GENDER_FEMALE) + if (caster->GetGender() == GENDER_FEMALE) caster->CastSpell(target, 46356, this); else caster->CastSpell(target, 46355, this); @@ -4823,7 +4823,7 @@ void AuraEffect::HandleAuraConvertRune(AuraApplication const* aurApp, uint8 mode if (!player) return; - if (player->getClass() != CLASS_DEATH_KNIGHT) + if (player->GetClass() != CLASS_DEATH_KNIGHT) return; uint32 runes = GetAmount(); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 91d4b4d80a4..15221c07d38 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -438,7 +438,7 @@ m_procCooldown(std::chrono::steady_clock::time_point::min()) _casterInfo.Level = m_spellInfo->SpellLevel; if (createInfo.Caster) { - _casterInfo.Level = createInfo.Caster->getLevel(); + _casterInfo.Level = createInfo.Caster->GetLevel(); _casterInfo.ApplyResilience = createInfo.Caster->CanApplyResilience(); SaveCasterInfo(createInfo.Caster); } @@ -831,7 +831,7 @@ void Aura::Update(uint32 diff, Unit* caster) m_timeCla -= diff; else if (caster) { - if (int32 manaPerSecond = m_spellInfo->ManaPerSecond + m_spellInfo->ManaPerSecondPerLevel * caster->getLevel()) + if (int32 manaPerSecond = m_spellInfo->ManaPerSecond + m_spellInfo->ManaPerSecondPerLevel * caster->GetLevel()) { m_timeCla += 1000 - diff; @@ -1740,7 +1740,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b break; if (target->GetTypeId() != TYPEID_PLAYER) break; - if (target->ToPlayer()->getClass() != CLASS_DEATH_KNIGHT) + if (target->ToPlayer()->GetClass() != CLASS_DEATH_KNIGHT) break; // aura removed - remove death runes @@ -2152,8 +2152,8 @@ float Aura::CalcProcChance(SpellProcEntry const& procEntry, ProcEventInfo& event } // proc chance is reduced by an additional 3.333% per level past 60 - if ((procEntry.AttributesMask & PROC_ATTR_REDUCE_PROC_60) && eventInfo.GetActor()->getLevel() > 60) - chance = std::max(0.f, (1.f - ((eventInfo.GetActor()->getLevel() - 60) * 1.f / 30.f)) * chance); + if ((procEntry.AttributesMask & PROC_ATTR_REDUCE_PROC_60) && eventInfo.GetActor()->GetLevel() > 60) + chance = std::max(0.f, (1.f - ((eventInfo.GetActor()->GetLevel() - 60) * 1.f / 30.f)) * chance); return chance; } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e7439700fc1..f9edb30ec30 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -548,7 +548,7 @@ m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerO { // wand case if (m_attackType == RANGED_ATTACK) - if ((playerCaster->getClassMask() & CLASSMASK_WAND_USERS) != 0) + if ((playerCaster->GetClassMask() & CLASSMASK_WAND_USERS) != 0) if (Item* pItem = playerCaster->GetWeaponForAttack(RANGED_ATTACK)) m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetTemplate()->Damage[0].DamageType); } @@ -2101,7 +2101,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= if (m_auraScaleMask && ihit->EffectMask == m_auraScaleMask && m_caster != target) { SpellInfo const* auraSpell = m_spellInfo->GetFirstRankSpell(); - if (uint32(target->getLevel() + 10) >= auraSpell->SpellLevel) + if (uint32(target->GetLevel() + 10) >= auraSpell->SpellLevel) ihit->ScaleAura = true; } return; @@ -2121,7 +2121,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= if (m_auraScaleMask && targetInfo.EffectMask == m_auraScaleMask && m_caster != target) { SpellInfo const* auraSpell = m_spellInfo->GetFirstRankSpell(); - if (uint32(target->getLevel() + 10) >= auraSpell->SpellLevel) + if (uint32(target->GetLevel() + 10) >= auraSpell->SpellLevel) targetInfo.ScaleAura = true; } @@ -2699,7 +2699,7 @@ SpellMissInfo Spell::PreprocessSpellHit(Unit* unit, bool scaleAura, TargetInfo& hitInfo.AuraSpellInfo = m_spellInfo; if (scaleAura) { - if (SpellInfo const* actualSpellInfo = m_spellInfo->GetAuraRankForLevel(unitTarget->getLevel())) + if (SpellInfo const* actualSpellInfo = m_spellInfo->GetAuraRankForLevel(unitTarget->GetLevel())) hitInfo.AuraSpellInfo = actualSpellInfo; for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) @@ -4168,7 +4168,7 @@ void Spell::SendSpellGo() castFlags |= CAST_FLAG_POWER_LEFT_SELF; if ((m_caster->GetTypeId() == TYPEID_PLAYER) - && (m_caster->ToPlayer()->getClass() == CLASS_DEATH_KNIGHT) + && (m_caster->ToPlayer()->GetClass() == CLASS_DEATH_KNIGHT) && m_spellInfo->RuneCostID && m_spellInfo->PowerType == POWER_RUNE && !(_triggeredCastFlags & TRIGGERED_IGNORE_POWER_AND_REAGENT_COST)) @@ -4753,7 +4753,7 @@ SpellCastResult Spell::CheckRuneCost(uint32 runeCostID) const if (!player) return SPELL_CAST_OK; - if (player->getClass() != CLASS_DEATH_KNIGHT) + if (player->GetClass() != CLASS_DEATH_KNIGHT) return SPELL_CAST_OK; SpellRuneCostEntry const* src = sSpellRuneCostStore.LookupEntry(runeCostID); @@ -4793,7 +4793,7 @@ SpellCastResult Spell::CheckRuneCost(uint32 runeCostID) const void Spell::TakeRunePower(bool didHit) { - if (m_caster->GetTypeId() != TYPEID_PLAYER || m_caster->ToPlayer()->getClass() != CLASS_DEATH_KNIGHT) + if (m_caster->GetTypeId() != TYPEID_PLAYER || m_caster->ToPlayer()->GetClass() != CLASS_DEATH_KNIGHT) return; SpellRuneCostEntry const* runeCostData = sSpellRuneCostStore.LookupEntry(m_spellInfo->RuneCostID); @@ -5401,7 +5401,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!learn_spellproto) return SPELL_FAILED_NOT_KNOWN; - if (m_spellInfo->SpellLevel > pet->getLevel()) + if (m_spellInfo->SpellLevel > pet->GetLevel()) return SPELL_FAILED_LOWLEVEL; break; @@ -5423,7 +5423,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!learn_spellproto) return SPELL_FAILED_NOT_KNOWN; - if (m_spellInfo->SpellLevel > pet->getLevel()) + if (m_spellInfo->SpellLevel > pet->GetLevel()) return SPELL_FAILED_LOWLEVEL; } break; @@ -5541,7 +5541,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint uint32 skill = creature->GetCreatureTemplate()->GetRequiredLootSkill(); int32 skillValue = m_caster->ToPlayer()->GetSkillValue(skill); - int32 TargetLevel = m_targets.GetUnitTarget()->getLevel(); + int32 TargetLevel = m_targets.GetUnitTarget()->GetLevel(); int32 ReqValue = (skillValue < 100 ? (TargetLevel-10) * 10 : TargetLevel * 5); if (ReqValue > skillValue) return SPELL_FAILED_LOW_CASTLEVEL; @@ -5861,7 +5861,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_TARGET_IS_PLAYER_CONTROLLED; int32 value = CalculateDamage(i); - if (value && int32(target->getLevel()) > value) + if (value && int32(target->GetLevel()) > value) return SPELL_FAILED_HIGHLEVEL; } @@ -7162,7 +7162,7 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff, Position const* lo if (target->GetCharmerGUID()) return false; if (int32 value = CalculateDamage(eff)) - if ((int32)target->getLevel() > value) + if ((int32)target->GetLevel() > value) return false; break; default: @@ -8115,7 +8115,7 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) const case TARGET_CHECK_RAID_CLASS: if (!refUnit) return false; - if (refUnit->getClass() != unitTarget->getClass()) + if (refUnit->GetClass() != unitTarget->GetClass()) return false; /* fallthrough */ case TARGET_CHECK_RAID: diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index fe4af438bc0..0d595e9a11f 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -352,7 +352,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) // Shield Slam if ((m_spellInfo->SpellFamilyFlags[1] & 0x200) && m_spellInfo->GetCategory() == 1209) { - uint8 level = unitCaster->getLevel(); + uint8 level = unitCaster->GetLevel(); uint32 block_value = unitCaster->GetShieldBlockValue(uint32(float(level) * 24.5f), uint32(float(level) * 34.5f)); damage += int32(unitCaster->ApplyEffectModifiers(m_spellInfo, effIndex, float(block_value))); } @@ -654,7 +654,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) // Shield of Righteousness if (m_spellInfo->SpellFamilyFlags[EFFECT_1] & 0x100000) { - uint8 level = unitCaster->getLevel(); + uint8 level = unitCaster->GetLevel(); uint32 block_value = unitCaster->GetShieldBlockValue(uint32(float(level) * 29.5f), uint32(float(level) * 39.5f)); damage += CalculatePct(block_value, m_spellInfo->Effects[EFFECT_1].CalcValue()); break; @@ -1647,15 +1647,15 @@ void Spell::EffectEnergize(SpellEffIndex effIndex) switch (m_spellInfo->Id) { case 9512: // Restore Energy - level_diff = unitCaster->getLevel() - 40; + level_diff = unitCaster->GetLevel() - 40; level_multiplier = 2; break; case 24571: // Blood Fury - level_diff = unitCaster->getLevel() - 60; + level_diff = unitCaster->GetLevel() - 60; level_multiplier = 10; break; case 24532: // Burst of Energy - level_diff = unitCaster->getLevel() - 60; + level_diff = unitCaster->GetLevel() - 60; level_multiplier = 4; break; case 31930: // Judgements of the Wise @@ -2481,7 +2481,7 @@ void Spell::EffectLearnSkill(SpellEffIndex effIndex) return; uint32 skillid = m_spellInfo->Effects[effIndex].MiscValue; - SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skillid, unitTarget->getRace(), unitTarget->getClass()); + SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skillid, unitTarget->GetRace(), unitTarget->GetClass()); if (!rcEntry) return; @@ -2512,7 +2512,7 @@ void Spell::EffectAddHonor(SpellEffIndex /*effIndex*/) // do not allow to add too many honor for player (50 * 21) = 1040 at level 70, or (50 * 31) = 1550 at level 80 if (damage <= 50) { - uint32 honor_reward = Trinity::Honor::hk_honor_at_level(unitTarget->getLevel(), float(damage)); + uint32 honor_reward = Trinity::Honor::hk_honor_at_level(unitTarget->GetLevel(), float(damage)); unitTarget->ToPlayer()->RewardHonor(nullptr, 1, honor_reward); TC_LOG_DEBUG("spells", "SpellEffect::AddHonor (spell_id %u) rewards %u honor points (scale) to player: %u", m_spellInfo->Id, honor_reward, unitTarget->ToPlayer()->GetGUID().GetCounter()); } @@ -2811,7 +2811,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) if (creatureTarget->IsPet()) return; - if (unitCaster->getClass() != CLASS_HUNTER) + if (unitCaster->GetClass() != CLASS_HUNTER) return; // cast finish successfully @@ -2825,7 +2825,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) // "kill" original creature creatureTarget->DespawnOrUnsummon(); - uint8 level = (creatureTarget->getLevel() < (unitCaster->getLevel() - 5)) ? (unitCaster->getLevel() - 5) : creatureTarget->getLevel(); + uint8 level = (creatureTarget->GetLevel() < (unitCaster->GetLevel() - 5)) ? (unitCaster->GetLevel() - 5) : creatureTarget->GetLevel(); // prepare visual effect for levelup pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1); @@ -3675,7 +3675,7 @@ void Spell::EffectDuel(SpellEffIndex effIndex) } pGameObj->SetFaction(caster->GetFaction()); - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, caster->getLevel() + 1); + pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, caster->GetLevel() + 1); int32 duration = m_spellInfo->GetDuration(); pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0); pGameObj->SetSpellId(m_spellInfo->Id); @@ -3804,7 +3804,7 @@ void Spell::EffectApplyGlyph(SpellEffIndex effIndex) case 4: minLevel = 70; break; case 5: minLevel = 80; break; } - if (minLevel && player->getLevel() < minLevel) + if (minLevel && player->GetLevel() < minLevel) { SendCastResult(SPELL_FAILED_GLYPH_SOCKET_LOCKED); return; @@ -4019,7 +4019,7 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex) } go->SetFaction(unitCaster->GetFaction()); - go->SetUInt32Value(GAMEOBJECT_LEVEL, unitCaster->getLevel()); + go->SetUInt32Value(GAMEOBJECT_LEVEL, unitCaster->GetLevel()); int32 duration = m_spellInfo->GetDuration(); go->SetRespawnTime(duration > 0 ? duration / IN_MILLISECONDS : 0); go->SetSpellId(m_spellInfo->Id); @@ -4234,7 +4234,7 @@ void Spell::EffectSkinning(SpellEffIndex /*effIndex*/) return; Creature* creature = unitTarget->ToCreature(); - int32 targetLevel = creature->getLevel(); + int32 targetLevel = creature->GetLevel(); uint32 skill = creature->GetCreatureTemplate()->GetRequiredLootSkill(); @@ -4735,7 +4735,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) pGameObj->SetOwnerGUID(unitCaster->GetGUID()); - //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, unitCaster->getLevel()); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, unitCaster->GetLevel()); pGameObj->SetSpellId(m_spellInfo->Id); ExecuteLogEffectSummonObject(effIndex, pGameObj); @@ -4749,7 +4749,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) if (GameObject* linkedTrap = pGameObj->GetLinkedTrap()) { linkedTrap->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0); - //linkedTrap->SetUInt32Value(GAMEOBJECT_LEVEL, unitCaster->getLevel()); + //linkedTrap->SetUInt32Value(GAMEOBJECT_LEVEL, unitCaster->GetLevel()); linkedTrap->SetSpellId(m_spellInfo->Id); linkedTrap->SetOwnerGUID(unitCaster->GetGUID()); @@ -5034,7 +5034,7 @@ void Spell::EffectActivateRune(SpellEffIndex effIndex) Player* player = m_caster->ToPlayer(); - if (player->getClass() != CLASS_DEATH_KNIGHT) + if (player->GetClass() != CLASS_DEATH_KNIGHT) return; // needed later @@ -5095,7 +5095,7 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || unitTarget->GetPetGUID() || unitTarget->getClass() != CLASS_HUNTER) + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || unitTarget->GetPetGUID() || unitTarget->GetClass() != CLASS_HUNTER) return; uint32 creatureEntry = m_spellInfo->Effects[effIndex].MiscValue; @@ -5197,7 +5197,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* unitCaster = unitCaster->ToTotem()->GetOwner(); // in another case summon new - uint8 level = unitCaster->getLevel(); + uint8 level = unitCaster->GetLevel(); // level of pet summoned using engineering item based at engineering skill level if (m_CastItem && unitCaster->GetTypeId() == TYPEID_PLAYER) diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index b8c3d17b1e1..9a3e8bc445b 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -408,7 +408,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32 // base amount modification based on spell lvl vs caster lvl if (casterUnit && basePointsPerLevel != 0.0f) { - int32 level = int32(casterUnit->getLevel()); + int32 level = int32(casterUnit->GetLevel()); if (level > int32(_spellInfo->MaxLevel) && _spellInfo->MaxLevel > 0) level = int32(_spellInfo->MaxLevel); else if (level < int32(_spellInfo->BaseLevel)) @@ -451,7 +451,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32 { // amount multiplication based on caster's level if (!casterUnit->IsControlledByPlayer() && - _spellInfo->SpellLevel && _spellInfo->SpellLevel != casterUnit->getLevel() && + _spellInfo->SpellLevel && _spellInfo->SpellLevel != casterUnit->GetLevel() && !basePointsPerLevel && _spellInfo->HasAttribute(SPELL_ATTR0_LEVEL_DAMAGE_CALCULATION)) { bool canEffectScale = false; @@ -495,7 +495,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32 if (canEffectScale) { GtNPCManaCostScalerEntry const* spellScaler = sGtNPCManaCostScalerStore.LookupEntry(_spellInfo->SpellLevel - 1); - GtNPCManaCostScalerEntry const* casterScaler = sGtNPCManaCostScalerStore.LookupEntry(casterUnit->getLevel() - 1); + GtNPCManaCostScalerEntry const* casterScaler = sGtNPCManaCostScalerStore.LookupEntry(casterUnit->GetLevel() - 1); if (spellScaler && casterScaler) value *= casterScaler->ratio / spellScaler->ratio; } @@ -545,7 +545,7 @@ float SpellEffectInfo::CalcRadius(WorldObject* caster /*= nullptr*/, Spell* spel if (caster) { if (Unit* casterUnit = caster->ToUnit()) - radius += RadiusEntry->RadiusPerLevel * casterUnit->getLevel(); + radius += RadiusEntry->RadiusPerLevel * casterUnit->GetLevel(); radius = std::min(radius, RadiusEntry->RadiusMax); @@ -3221,7 +3221,7 @@ int32 SpellInfo::CalcPowerCost(WorldObject const* caster, SpellSchoolMask school if (HasAttribute(SPELL_ATTR0_LEVEL_DAMAGE_CALCULATION)) { GtNPCManaCostScalerEntry const* spellScaler = sGtNPCManaCostScalerStore.LookupEntry(SpellLevel - 1); - GtNPCManaCostScalerEntry const* casterScaler = sGtNPCManaCostScalerStore.LookupEntry(unitCaster->getLevel() - 1); + GtNPCManaCostScalerEntry const* casterScaler = sGtNPCManaCostScalerStore.LookupEntry(unitCaster->GetLevel() - 1); if (spellScaler && casterScaler) powerCost *= casterScaler->ratio / spellScaler->ratio; } diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index f7b004f9b38..96ee5bdf4fe 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -696,11 +696,11 @@ SpellAreaForQuestAreaMapBounds SpellMgr::GetSpellAreaForQuestAreaMapBounds(uint3 bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const { if (gender != GENDER_NONE) // is not expected gender - if (!player || gender != player->getGender()) + if (!player || gender != player->GetGender()) return false; if (raceMask) // is not expected race - if (!player || !(raceMask & player->getRaceMask())) + if (!player || !(raceMask & player->GetRaceMask())) return false; if (areaId) // is not in expected zone diff --git a/src/server/game/Storages/WhoListStorage.cpp b/src/server/game/Storages/WhoListStorage.cpp index 91e17d84397..52087b45c4f 100644 --- a/src/server/game/Storages/WhoListStorage.cpp +++ b/src/server/game/Storages/WhoListStorage.cpp @@ -54,8 +54,8 @@ void WhoListStorageMgr::Update() wstrToLower(wideGuildName); - _whoListStorage.emplace_back(itr->second->GetGUID(), itr->second->GetTeam(), itr->second->GetSession()->GetSecurity(), itr->second->getLevel(), - itr->second->getClass(), itr->second->getRace(), itr->second->GetZoneId(), itr->second->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), itr->second->IsVisible(), + _whoListStorage.emplace_back(itr->second->GetGUID(), itr->second->GetTeam(), itr->second->GetSession()->GetSecurity(), itr->second->GetLevel(), + itr->second->GetClass(), itr->second->GetRace(), itr->second->GetZoneId(), itr->second->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), itr->second->IsVisible(), widePlayerName, wideGuildName, playerName, guildName); } } diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 0abb6556d36..87c6fb028dc 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -263,12 +263,12 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, WorldObject if (srcPlr) { - PlayerTextBuilder builder(source, finalSource, finalSource->getGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget); + PlayerTextBuilder builder(source, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget); SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly); } else { - CreatureTextBuilder builder(finalSource, finalSource->getGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget); + CreatureTextBuilder builder(finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget); SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly); } diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index e52555ea634..02fe8b3e549 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -281,7 +281,7 @@ public: if (titleInfo && target->HasTitle(titleInfo)) { - std::string name = target->getGender() == GENDER_MALE ? titleInfo->nameMale[loc] : titleInfo->nameFemale[loc]; + std::string name = target->GetGender() == GENDER_MALE ? titleInfo->nameMale[loc] : titleInfo->nameFemale[loc]; if (name.empty()) continue; @@ -453,7 +453,7 @@ public: if (!handler->extractPlayerTarget(nameStr, &target, &targetGuid, &targetName)) return false; - int32 oldlevel = target ? target->getLevel() : sCharacterCache->GetCharacterLevelByGuid(targetGuid); + int32 oldlevel = target ? target->GetLevel() : sCharacterCache->GetCharacterLevelByGuid(targetGuid); int32 newlevel = levelStr ? atoi(levelStr) : oldlevel; if (newlevel < 1) @@ -907,7 +907,7 @@ public: if (!handler->extractPlayerTarget(nameStr, &target, &targetGuid, &targetName)) return false; - int32 oldlevel = target ? target->getLevel() : sCharacterCache->GetCharacterLevelByGuid(targetGuid); + int32 oldlevel = target ? target->GetLevel() : sCharacterCache->GetCharacterLevelByGuid(targetGuid); int32 addlevel = levelStr ? atoi(levelStr) : 1; int32 newlevel = oldlevel + addlevel; diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index ed0015f6a12..c76c9396cf7 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -148,7 +148,7 @@ public: static bool HandleLearnAllMySpellsCommand(ChatHandler* handler, char const* /*args*/) { - ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(handler->GetSession()->GetPlayer()->getClass()); + ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(handler->GetSession()->GetPlayer()->GetClass()); if (!classEntry) return true; uint32 family = classEntry->spellfamily; @@ -193,7 +193,7 @@ public: static bool HandleLearnAllMyTalentsCommand(ChatHandler* handler, char const* /*args*/) { Player* player = handler->GetSession()->GetPlayer(); - uint32 classMask = player->getClassMask(); + uint32 classMask = player->GetClassMask(); for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i) { @@ -441,7 +441,7 @@ public: static void HandleLearnSkillRecipesHelper(Player* player, uint32 skillId) { - uint32 classmask = player->getClassMask(); + uint32 classmask = player->GetClassMask(); for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j) { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b595fb9e3cb..a6083fd53e6 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1623,15 +1623,15 @@ public: accId = target->GetSession()->GetAccountId(); money = target->GetMoney(); totalPlayerTime = target->GetTotalPlayedTime(); - level = target->getLevel(); + level = target->GetLevel(); latency = target->GetSession()->GetLatency(); - raceid = target->getRace(); - classid = target->getClass(); + raceid = target->GetRace(); + classid = target->GetClass(); muteTime = target->GetSession()->m_muteTime; mapId = target->GetMapId(); areaId = target->GetAreaId(); alive = target->IsAlive() ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO); - gender = target->getGender(); + gender = target->GetGender(); phase = target->GetPhaseMask(); } // get additional information from DB diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 8a669557f83..0fa11461509 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -889,7 +889,7 @@ public: return false; } - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(target->getRace(), target->getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(target->GetRace(), target->GetClass()); if (!info) return false; @@ -900,14 +900,14 @@ public: if (!strncmp(gender_str, "male", gender_len)) // MALE { - if (target->getGender() == GENDER_MALE) + if (target->GetGender() == GENDER_MALE) return true; gender = GENDER_MALE; } else if (!strncmp(gender_str, "female", gender_len)) // FEMALE { - if (target->getGender() == GENDER_FEMALE) + if (target->GetGender() == GENDER_FEMALE) return true; gender = GENDER_FEMALE; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 243aa3cb104..18d937b1e06 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -656,7 +656,7 @@ public: handler->PSendSysMessage(LANG_SPAWNINFO_GROUP_ID, groupData->name.c_str(), groupData->groupId, groupData->flags, target->GetMap()->IsSpawnGroupActive(groupData->groupId)); } handler->PSendSysMessage(LANG_SPAWNINFO_COMPATIBILITY_MODE, target->GetRespawnCompatibilityMode()); - handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel()); + handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->GetLevel()); handler->PSendSysMessage(LANG_NPCINFO_EQUIPMENT, target->GetCurrentEquipmentId(), target->GetOriginalEquipmentId()); handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); handler->PSendSysMessage(LANG_NPCINFO_MOVEMENT_DATA, target->GetMovementTemplate().ToString().c_str()); @@ -1343,7 +1343,7 @@ public: pet->SetReactState(REACT_DEFENSIVE); // calculate proper level - uint8 level = std::max<uint8>(player->getLevel()-5, creatureTarget->getLevel()); + uint8 level = std::max<uint8>(player->GetLevel()-5, creatureTarget->GetLevel()); // prepare visual effect for levelup pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1); diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index afe1f86d780..25290cfcdde 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -105,7 +105,7 @@ public: pet->SetGuidValue(UNIT_FIELD_CREATEDBY, player->GetGUID()); pet->SetFaction(player->GetFaction()); - if (!pet->InitStatsForLevel(creatureTarget->getLevel())) + if (!pet->InitStatsForLevel(creatureTarget->GetLevel())) { TC_LOG_ERROR("misc", "InitStatsForLevel() in EffectTameCreature failed! Pet deleted."); handler->PSendSysMessage("Error 2"); @@ -114,7 +114,7 @@ public: } // prepare visual effect for levelup - pet->SetUInt32Value(UNIT_FIELD_LEVEL, creatureTarget->getLevel()-1); + pet->SetUInt32Value(UNIT_FIELD_LEVEL, creatureTarget->GetLevel()-1); pet->GetCharmInfo()->SetPetNumber(sObjectMgr->GeneratePetNumber(), true); // this enables pet details window (Shift+P) @@ -124,7 +124,7 @@ public: pet->GetMap()->AddToMap(pet->ToCreature()); // visual effect for levelup - pet->SetUInt32Value(UNIT_FIELD_LEVEL, creatureTarget->getLevel()); + pet->SetUInt32Value(UNIT_FIELD_LEVEL, creatureTarget->GetLevel()); player->SetMinion(pet, true); pet->SavePetToDB(PET_SAVE_AS_CURRENT); @@ -211,7 +211,7 @@ public: int32 level = args ? atoi(args) : 0; if (level == 0) - level = owner->getLevel() - pet->getLevel(); + level = owner->GetLevel() - pet->GetLevel(); if (level == 0 || level < -STRONG_MAX_LEVEL || level > STRONG_MAX_LEVEL) { handler->SendSysMessage(LANG_BAD_VALUE); @@ -219,11 +219,11 @@ public: return false; } - int32 newLevel = pet->getLevel() + level; + int32 newLevel = pet->GetLevel() + level; if (newLevel < 1) newLevel = 1; - else if (newLevel > owner->getLevel()) - newLevel = owner->getLevel(); + else if (newLevel > owner->GetLevel()) + newLevel = owner->GetLevel(); pet->GivePetLevel(newLevel); return true; diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index ea643e57f2f..8f9e4784977 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -94,10 +94,10 @@ public: static bool HandleResetStatsOrLevelHelper(Player* player) { - ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(player->getClass()); + ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(player->GetClass()); if (!classEntry) { - TC_LOG_ERROR("misc", "Class %u not found in DBC (Wrong DBC files?)", player->getClass()); + TC_LOG_ERROR("misc", "Class %u not found in DBC (Wrong DBC files?)", player->GetClass()); return false; } @@ -107,7 +107,7 @@ public: if (!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) player->SetShapeshiftForm(FORM_NONE); - player->setFactionForRace(player->getRace()); + player->setFactionForRace(player->GetRace()); player->SetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_POWER_TYPE, powerType); @@ -133,10 +133,10 @@ public: if (!HandleResetStatsOrLevelHelper(target)) return false; - uint8 oldLevel = target->getLevel(); + uint8 oldLevel = target->GetLevel(); // set starting level - uint32 startLevel = target->getClass() != CLASS_DEATH_KNIGHT + uint32 startLevel = target->GetClass() != CLASS_DEATH_KNIGHT ? sWorld->getIntConfig(CONFIG_START_PLAYER_LEVEL) : sWorld->getIntConfig(CONFIG_START_DEATH_KNIGHT_PLAYER_LEVEL); diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 21f3dae4966..7a389b66f36 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -94,7 +94,7 @@ public: target->SetTitle(titleInfo); // to be sure that title now known target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->bit_index); - handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, id, target->getGender() == GENDER_MALE ? titleInfo->nameMale[handler->GetSessionDbcLocale()] : titleInfo->nameFemale[handler->GetSessionDbcLocale()], tNameLink.c_str()); + handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, id, target->GetGender() == GENDER_MALE ? titleInfo->nameMale[handler->GetSessionDbcLocale()] : titleInfo->nameFemale[handler->GetSessionDbcLocale()], tNameLink.c_str()); return true; } @@ -137,7 +137,7 @@ public: std::string tNameLink = handler->GetNameLink(target); char titleNameStr[80]; - snprintf(titleNameStr, 80, target->getGender() == GENDER_MALE ? titleInfo->nameMale[handler->GetSessionDbcLocale()] : titleInfo->nameFemale[handler->GetSessionDbcLocale()], target->GetName().c_str()); + snprintf(titleNameStr, 80, target->GetGender() == GENDER_MALE ? titleInfo->nameMale[handler->GetSessionDbcLocale()] : titleInfo->nameFemale[handler->GetSessionDbcLocale()], target->GetName().c_str()); target->SetTitle(titleInfo); handler->PSendSysMessage(LANG_TITLE_ADD_RES, id, titleNameStr, tNameLink.c_str()); @@ -185,7 +185,7 @@ public: std::string tNameLink = handler->GetNameLink(target); char titleNameStr[80]; - snprintf(titleNameStr, 80, target->getGender() == GENDER_MALE ? titleInfo->nameMale[handler->GetSessionDbcLocale()] : titleInfo->nameFemale[handler->GetSessionDbcLocale()], target->GetName().c_str()); + snprintf(titleNameStr, 80, target->GetGender() == GENDER_MALE ? titleInfo->nameMale[handler->GetSessionDbcLocale()] : titleInfo->nameFemale[handler->GetSessionDbcLocale()], target->GetName().c_str()); handler->PSendSysMessage(LANG_TITLE_REMOVE_RES, id, titleNameStr, tNameLink.c_str()); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index 12cf5d67072..7d55c4a102b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -597,7 +597,7 @@ public: { if (Creature* infiltrator = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_SCARSHIELD_INFILTRATOR))) { - if (player->getLevel() >= 57) + if (player->GetLevel() >= 57) infiltrator->AI()->SetData(1, 1); else if (infiltrator->GetEntry() == NPC_SCARSHIELD_INFILTRATOR) infiltrator->AI()->Talk(0, player); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 6ec4caac74d..f9a8acdde6b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -515,7 +515,7 @@ public: break; case EVENT_CLASSCALL: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) - switch (target->getClass()) + switch (target->GetClass()) { case CLASS_MAGE: Talk(SAY_MAGE); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index c0a1b23cbdd..94a29a98637 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -623,7 +623,7 @@ public: // summoned->SetVisibility(VISIBILITY_OFF); //with this we cant see the armageddon visuals } else - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); summoned->SetFaction(me->GetFaction()); summons.Summon(summoned); @@ -952,7 +952,7 @@ public: void JustSummoned(Creature* summoned) override { summoned->SetFaction(me->GetFaction()); - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); } void JustEngagedWith(Unit* who) override @@ -1045,7 +1045,7 @@ public: void JustSummoned(Creature* summoned) override { summoned->SetFaction(me->GetFaction()); - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); } void UpdateAI(uint32 diff) override @@ -1326,7 +1326,7 @@ public: if ((victimClass == 0) && me->GetVictim()) { - victimClass = me->EnsureVictim()->getClass(); + victimClass = me->EnsureVictim()->GetClass(); switch (victimClass) { case CLASS_DRUID: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 63bce7dec6e..cb02729b44b 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -443,7 +443,7 @@ class boss_hexlord_malacrass : public CreatureScript PlayerGUID = target->GetGUID(); PlayerAbility_Timer = urand(8000, 10000); - PlayerClass = target->getClass() - 1; + PlayerClass = target->GetClass() - 1; if (PlayerClass == CLASS_DRUID - 1) PlayerClass = CLASS_DRUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 4377e675274..49fbeefaa78 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -426,7 +426,7 @@ public: if (victim->GetTypeId() == TYPEID_PLAYER) { - switch (victim->getClass()) + switch (victim->GetClass()) { case CLASS_PRIEST: case CLASS_PALADIN: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 594e19ea832..4763a65a131 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1174,7 +1174,7 @@ class spell_sindragosa_unchained_magic : public SpellScript continue; } - switch (player->getClass()) + switch (player->GetClass()) { case CLASS_PRIEST: case CLASS_MAGE: diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 53fb8498324..c422a1ffe8c 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -284,7 +284,7 @@ public: soulmodel = target->GetDisplayId(); soulholder = target->GetGUID(); - soulclass = target->getClass(); + soulclass = target->GetClass(); DoCast(target, SPELL_STOLEN_SOUL); me->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 382eb1a04c1..517b51775ba 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -98,7 +98,7 @@ public: { summoned->CastSpell(summoned, SPELL_FOCUS_FIRE_VISUAL, false); summoned->SetFaction(me->GetFaction()); - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); summoned->AddUnitState(UNIT_STATE_ROOT); if (Unit* pFocusedTarget = ObjectAccessor::GetUnit(*me, FocusedTargetGUID)) diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index e5732e977b9..da9cdaa1a66 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -104,7 +104,7 @@ class boss_nazan : public CreatureScript { if (summoned && summoned->GetEntry() == NPC_LIQUID_FIRE) { - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); summoned->SetFaction(me->GetFaction()); summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE, SPELL_SUMMON_LIQUID_FIRE_H), true); summoned->CastSpell(summoned, SPELL_FIRE_NOVA_VISUAL, true); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 571089ba18b..e7e6f3cc388 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -441,7 +441,7 @@ class boss_alar : public CreatureScript Summoned->SetObjectScale(Summoned->GetObjectScale() * 2.5f); Summoned->SetDisplayId(11686); Summoned->SetFaction(me->GetFaction()); - Summoned->SetLevel(me->getLevel()); + Summoned->SetLevel(me->GetLevel()); Summoned->CastSpell(Summoned, SPELL_FLAME_PATCH, false); } } diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 0ece09ce8b0..4c608753969 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -146,8 +146,8 @@ class spell_pet_dk_gargoyle_strike : public SpellScript int32 damage = 60; if (Unit* caster = GetCaster()) { - if (caster->getLevel() >= 60) - damage += (caster->getLevel() - 60) * 4; + if (caster->GetLevel() >= 60) + damage += (caster->GetLevel() - 60) * 4; } SetEffectValue(damage); diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index 3bfa8c1b5a3..2ba07b41060 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -69,7 +69,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript { _isViper = me->GetEntry() == NPC_HUNTER_VIPER ? true : false; - me->SetMaxHealth(uint32(107 * (me->getLevel() - 40) * 0.025f)); + me->SetMaxHealth(uint32(107 * (me->GetLevel() - 40) * 0.025f)); // Add delta to make them not all hit the same time me->SetAttackTime(BASE_ATTACK, me->GetAttackTime(BASE_ATTACK) + urandms(0,6)); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index d1f3527442c..4c80eb38327 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -223,7 +223,7 @@ public: { if (Unit* caster = eventInfo.GetActor()) { - if (caster->GetTypeId() != TYPEID_PLAYER || caster->getClass() != CLASS_DEATH_KNIGHT) + if (caster->GetTypeId() != TYPEID_PLAYER || caster->GetClass() != CLASS_DEATH_KNIGHT) return false; for (uint8 i = 0; i < MAX_RUNES; ++i) @@ -431,7 +431,7 @@ class spell_dk_blade_barrier : public SpellScriptLoader { if (eventInfo.GetSpellInfo() != nullptr) if (Player* player = eventInfo.GetActor()->ToPlayer()) - if (player->getClass() == CLASS_DEATH_KNIGHT && player->IsBaseRuneSlotsOnCooldown(RUNE_BLOOD)) + if (player->GetClass() == CLASS_DEATH_KNIGHT && player->IsBaseRuneSlotsOnCooldown(RUNE_BLOOD)) return true; return false; @@ -473,7 +473,7 @@ class spell_dk_blood_boil : public SpellScriptLoader bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCaster()->getClass() == CLASS_DEATH_KNIGHT; + return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCaster()->GetClass() == CLASS_DEATH_KNIGHT; } void HandleAfterHit() @@ -908,7 +908,7 @@ class spell_dk_death_gate : public SpellScriptLoader SpellCastResult CheckClass() { - if (GetCaster()->getClass() != CLASS_DEATH_KNIGHT) + if (GetCaster()->GetClass() != CLASS_DEATH_KNIGHT) { SetCustomCastResultMessage(SPELL_CUSTOM_ERROR_MUST_BE_DEATH_KNIGHT); return SPELL_FAILED_CUSTOM_ERROR; @@ -1037,7 +1037,7 @@ class spell_dk_death_rune : public SpellScriptLoader bool Load() override { - return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER && GetUnitOwner()->ToPlayer()->getClass() == CLASS_DEATH_KNIGHT; + return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER && GetUnitOwner()->ToPlayer()->GetClass() == CLASS_DEATH_KNIGHT; } bool CheckProc(ProcEventInfo& eventInfo) @@ -1048,7 +1048,7 @@ class spell_dk_death_rune : public SpellScriptLoader return false; Player* player = caster->ToPlayer(); - if (player->getClass() != CLASS_DEATH_KNIGHT) + if (player->GetClass() != CLASS_DEATH_KNIGHT) return false; return true; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 9b8fdb625d0..24b244d69e4 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -414,7 +414,7 @@ class spell_gen_aura_service_uniform : public AuraScript Unit* target = GetTarget(); if (target->GetTypeId() == TYPEID_PLAYER) { - if (target->getGender() == GENDER_MALE) + if (target->GetGender() == GENDER_MALE) target->SetDisplayId(MODEL_GOBLIN_MALE); else target->SetDisplayId(MODEL_GOBLIN_FEMALE); @@ -1222,7 +1222,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader { if (Player* player = GetHitPlayer()) { - uint8 gender = player->getGender(); + uint8 gender = player->GetGender(); uint32 spellId = GetSpellInfo()->Id; @@ -1676,7 +1676,7 @@ class spell_ethereal_pet_aura : public AuraScript bool CheckProc(ProcEventInfo& eventInfo) { - uint32 levelDiff = std::abs(GetTarget()->getLevel() - eventInfo.GetProcTarget()->getLevel()); + uint32 levelDiff = std::abs(GetTarget()->GetLevel() - eventInfo.GetProcTarget()->GetLevel()); return levelDiff <= 9; } @@ -1988,14 +1988,14 @@ class spell_gen_magic_rooster : public SpellScript target->RemoveAurasByType(SPELL_AURA_MOUNTED); uint32 spellId = SPELL_MAGIC_ROOSTER_NORMAL; - switch (target->getRace()) + switch (target->GetRace()) { case RACE_DRAENEI: - if (target->getGender() == GENDER_MALE) + if (target->GetGender() == GENDER_MALE) spellId = SPELL_MAGIC_ROOSTER_DRAENEI_MALE; break; case RACE_TAUREN: - if (target->getGender() == GENDER_MALE) + if (target->GetGender() == GENDER_MALE) spellId = SPELL_MAGIC_ROOSTER_TAUREN_MALE; break; default: @@ -2638,7 +2638,7 @@ class spell_gen_orc_disguise : public SpellScript Unit* caster = GetCaster(); if (Player* target = GetHitPlayer()) { - uint8 gender = target->getGender(); + uint8 gender = target->GetGender(); if (!gender) caster->CastSpell(target, SPELL_ORC_DISGUISE_MALE, true); else @@ -2788,7 +2788,7 @@ class spell_gen_pet_summoned : public SpellScript Player* player = GetCaster()->ToPlayer(); if (player->GetLastPetNumber()) { - PetType newPetType = (player->getClass() == CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET; + PetType newPetType = (player->GetClass() == CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET; Pet* newPet = new Pet(player, newPetType); if (newPet->LoadPetFromDB(player, 0, player->GetLastPetNumber(), true)) { @@ -3737,7 +3737,7 @@ class spell_gen_gm_freeze : public AuraScript player->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); // if player class = hunter || warlock remove pet if alive - if ((player->getClass() == CLASS_HUNTER) || (player->getClass() == CLASS_WARLOCK)) + if ((player->GetClass() == CLASS_HUNTER) || (player->GetClass() == CLASS_WARLOCK)) { if (Pet* pet = player->GetPet()) { @@ -3756,7 +3756,7 @@ class spell_gen_gm_freeze : public AuraScript if (Player* player = GetTarget()->ToPlayer()) { // Reset player faction + allow combat + allow duels - player->setFactionForRace(player->getRace()); + player->setFactionForRace(player->GetRace()); player->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); // save player player->SaveToDB(); diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 542408f367a..4067846281c 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -187,13 +187,13 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - uint32 spell = GetTarget()->getGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE; + uint32 spell = GetTarget()->GetGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE; GetTarget()->CastSpell(GetTarget(), spell, true); } void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - uint32 spell = GetTarget()->getGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE; + uint32 spell = GetTarget()->GetGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE; GetTarget()->RemoveAurasDueToSpell(spell); } @@ -256,7 +256,7 @@ class spell_hallow_end_trick : public SpellScriptLoader Unit* caster = GetCaster(); if (Player* target = GetHitPlayer()) { - uint8 gender = target->getGender(); + uint8 gender = target->GetGender(); uint32 spellId = SPELL_TRICK_BUFF; switch (urand(0, 5)) { @@ -424,7 +424,7 @@ public: Unit* target = GetHitUnit(); uint32 spellId = 0; - uint8 gender = target->getGender(); + uint8 gender = target->GetGender(); switch (GetSpellInfo()->Id) { diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 402797e161a..bb4f38ce06d 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -1418,7 +1418,7 @@ class spell_hun_tame_beast : public SpellScriptLoader if (Creature* target = GetExplTargetUnit()->ToCreature()) { - if (target->getLevel() > caster->getLevel()) + if (target->GetLevel() > caster->GetLevel()) return SPELL_FAILED_HIGHLEVEL; // use SMSG_PET_TAME_FAILURE? diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 7864dd84586..0302db3c9bd 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -282,7 +282,7 @@ class spell_item_arcane_shroud : public AuraScript void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { - int32 diff = GetUnitOwner()->getLevel() - 60; + int32 diff = GetUnitOwner()->GetLevel() - 60; if (diff > 0) amount += 2 * diff; } @@ -365,7 +365,7 @@ class spell_item_aura_of_madness : public AuraScript PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); - uint32 spellId = Trinity::Containers::SelectRandomContainerElement(triggeredSpells[caster->getClass()]); + uint32 spellId = Trinity::Containers::SelectRandomContainerElement(triggeredSpells[caster->GetClass()]); caster->CastSpell(caster, spellId, aurEff); if (roll_chance_i(10)) @@ -593,7 +593,7 @@ class spell_item_deathbringers_will : public SpellScriptLoader PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); - std::vector<uint32> const& randomSpells = triggeredSpells[caster->getClass()]; + std::vector<uint32> const& randomSpells = triggeredSpells[caster->GetClass()]; if (randomSpells.empty()) return; @@ -930,7 +930,7 @@ class spell_item_flask_of_the_north : public SpellScript { Unit* caster = GetCaster(); std::vector<uint32> possibleSpells; - switch (caster->getClass()) + switch (caster->GetClass()) { case CLASS_WARLOCK: case CLASS_MAGE: @@ -1646,9 +1646,9 @@ class spell_item_savory_deviate_delight : public SpellScript switch (urand(1, 2)) { // Flip Out - ninja - case 1: spellId = (caster->getGender() == GENDER_MALE ? SPELL_FLIP_OUT_MALE : SPELL_FLIP_OUT_FEMALE); break; + case 1: spellId = (caster->GetGender() == GENDER_MALE ? SPELL_FLIP_OUT_MALE : SPELL_FLIP_OUT_FEMALE); break; // Yaaarrrr - pirate - case 2: spellId = (caster->getGender() == GENDER_MALE ? SPELL_YAAARRRR_MALE : SPELL_YAAARRRR_FEMALE); break; + case 2: spellId = (caster->GetGender() == GENDER_MALE ? SPELL_YAAARRRR_MALE : SPELL_YAAARRRR_FEMALE); break; } caster->CastSpell(caster, spellId, true); } @@ -1700,7 +1700,7 @@ class spell_item_scroll_of_recall : public SpellScript break; } - if (caster->getLevel() > maxSafeLevel) + if (caster->GetLevel() > maxSafeLevel) { caster->CastSpell(caster, SPELL_LOST, true); @@ -2195,7 +2195,7 @@ class spell_item_the_eye_of_diminution : public AuraScript void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { - int32 diff = GetUnitOwner()->getLevel() - 60; + int32 diff = GetUnitOwner()->GetLevel() - 60; if (diff > 0) amount += diff; } @@ -3280,7 +3280,7 @@ class spell_item_refocus : public SpellScript { Player* caster = GetCaster()->ToPlayer(); - if (!caster || caster->getClass() != CLASS_HUNTER) + if (!caster || caster->GetClass() != CLASS_HUNTER) return; if (caster->GetSpellHistory()->HasCooldown(SPELL_AIMED_SHOT)) @@ -3424,7 +3424,7 @@ class spell_item_soul_preserver : public AuraScript Unit* caster = eventInfo.GetActor(); - switch (caster->getClass()) + switch (caster->GetClass()) { case CLASS_DRUID: caster->CastSpell(caster, SPELL_SOUL_PRESERVER_DRUID, aurEff); @@ -3539,7 +3539,7 @@ class spell_item_toy_train_set_pulse : public SpellScript if (Player* target = GetHitUnit()->ToPlayer()) { target->HandleEmoteCommand(EMOTE_ONESHOT_TRAIN); - if (EmotesTextSoundEntry const* soundEntry = FindTextSoundEmoteFor(TEXT_EMOTE_TRAIN, target->getRace(), target->getGender())) + if (EmotesTextSoundEntry const* soundEntry = FindTextSoundEmoteFor(TEXT_EMOTE_TRAIN, target->GetRace(), target->GetGender())) target->PlayDistanceSound(soundEntry->SoundId); } } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index f0b443955e1..f4155c9a209 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -393,7 +393,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader if (Unit* unitTarget = GetHitUnit()) { uint32 spell_id = 0; - switch (unitTarget->getClass()) + switch (unitTarget->GetClass()) { case CLASS_DRUID: spell_id = SPELL_PALADIN_BLESSING_OF_LOWER_CITY_DRUID; @@ -2319,7 +2319,7 @@ class spell_pal_t3_6p_bonus : public SpellScriptLoader Unit* caster = eventInfo.GetActor(); Unit* target = eventInfo.GetProcTarget(); - switch (target->getClass()) + switch (target->GetClass()) { case CLASS_PALADIN: case CLASS_PRIEST: diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index c41e6d717b3..8a4bb75a0d1 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -262,7 +262,7 @@ public: if (Unit* pet = GetUnitOwner()) if (_tempBonus) { - PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel()); + PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->GetLevel()); uint32 healthMod = 0; uint32 baseHealth = pInfo->health; switch (pet->GetEntry()) @@ -294,7 +294,7 @@ public: if (Unit* pet = GetUnitOwner()) if (pet->IsPet()) { - PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel()); + PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->GetLevel()); pet->ToPet()->SetCreateHealth(pInfo->health); } } @@ -408,7 +408,7 @@ public: if (Unit* pet = GetUnitOwner()) if (_tempBonus) { - PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel()); + PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->GetLevel()); uint32 manaMod = 0; uint32 baseMana = pInfo->mana; switch (pet->GetEntry()) @@ -436,7 +436,7 @@ public: if (Unit* pet = GetUnitOwner()) if (pet->IsPet()) { - PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel()); + PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->GetLevel()); pet->ToPet()->SetCreateMana(pInfo->mana); } } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index c2454d5b9e1..1d871b7615d 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -352,7 +352,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader if (AuraEffect const* aegis = eventInfo.GetProcTarget()->GetAuraEffect(SPELL_PRIEST_DIVINE_AEGIS, EFFECT_0)) absorb += aegis->GetAmount(); - absorb = std::min(absorb, eventInfo.GetProcTarget()->getLevel() * 125); + absorb = std::min(absorb, eventInfo.GetProcTarget()->GetLevel() * 125); CastSpellExtraArgs args(aurEff); args.AddSpellBP0(absorb); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index faba3d88f0d..54cd59685b8 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -823,7 +823,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader PreventHitDefaultEffect(effIndex); if (Player* target = GetHitPlayer()) { - target->CastSpell(target, target->getGender() == GENDER_MALE ? SPELL_MALE_DISGUISE : SPELL_FEMALE_DISGUISE, true); + target->CastSpell(target, target->GetGender() == GENDER_MALE ? SPELL_MALE_DISGUISE : SPELL_FEMALE_DISGUISE, true); target->CastSpell(target, SPELL_GENERIC_DISGUISE, true); } } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index e765b12e932..886a18fc6cf 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -2037,7 +2037,7 @@ class spell_sha_t3_6p_bonus : public SpellScriptLoader Unit* caster = eventInfo.GetActor(); Unit* target = eventInfo.GetProcTarget(); - switch (target->getClass()) + switch (target->GetClass()) { case CLASS_PALADIN: case CLASS_PRIEST: diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index 39bb713d69d..f1c1e7217af 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -78,11 +78,11 @@ class DuelResetScript : public PlayerScript loser->RestoreHealthAfterDuel(); // check if player1 class uses mana - if (winner->GetPowerType() == POWER_MANA || winner->getClass() == CLASS_DRUID) + if (winner->GetPowerType() == POWER_MANA || winner->GetClass() == CLASS_DRUID) winner->RestoreManaAfterDuel(); // check if player2 class uses mana - if (loser->GetPowerType() == POWER_MANA || loser->getClass() == CLASS_DRUID) + if (loser->GetPowerType() == POWER_MANA || loser->GetClass() == CLASS_DRUID) loser->RestoreManaAfterDuel(); } } diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 08061269631..1b0fe266d87 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1248,7 +1248,7 @@ public: Creature* target = GetClosestCreatureWithEntry(player, NPC_OUTHOUSE_BUNNY, 3.0f); if (target) { - target->AI()->SetData(1, player->getGender()); + target->AI()->SetData(1, player->GetGender()); me->CastSpell(target, SPELL_INDISPOSED_III); } me->CastSpell(player, SPELL_INDISPOSED); diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 4a397ed989a..f23af603c4e 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -399,11 +399,11 @@ class item_generic_limit_chance_above_60 : public ItemScript bool OnCastItemCombatSpell(Player* /*player*/, Unit* victim, SpellInfo const* /*spellInfo*/, Item* /*item*/) override { // spell proc chance gets severely reduced on victims > 60 (formula unknown) - if (victim->getLevel() > 60) + if (victim->GetLevel() > 60) { // gives ~0.1% proc chance at lvl 70 float const lvlPenaltyFactor = 9.93f; - float const failureChance = (victim->getLevel() - 60) * lvlPenaltyFactor; + float const failureChance = (victim->GetLevel() - 60) * lvlPenaltyFactor; // base ppm chance was already rolled, only roll success chance return !roll_chance_f(failureChance); diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index f3b26a0268a..0156d2ab12e 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -208,7 +208,7 @@ int32 DoHighUnlearnCost(Player* /*player*/) //tailor int32 DoMedUnlearnCost(Player* player) //blacksmith, leatherwork { - uint8 level = player->getLevel(); + uint8 level = player->GetLevel(); if (level < 51) return 250000; else if (level < 66) @@ -219,7 +219,7 @@ int32 DoMedUnlearnCost(Player* player) //blacksmith, leather int32 DoLowUnlearnCost(Player* player) //blacksmith { - uint8 level = player->getLevel(); + uint8 level = player->GetLevel(); if (level < 66) return 50000; else @@ -458,7 +458,7 @@ public: } } //WEAPONSMITH SPEC - if (player->HasSpell(S_WEAPON) && player->getLevel() > 49 && player->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 250) + if (player->HasSpell(S_WEAPON) && player->GetLevel() > 49 && player->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 250) { switch (creatureId) { @@ -865,7 +865,7 @@ public: if (me->IsTrainer()) AddGossipItemFor(player, GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); - if (player->HasSkill(SKILL_LEATHERWORKING) && player->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && player->getLevel() > 49) + if (player->HasSkill(SKILL_LEATHERWORKING) && player->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && player->GetLevel() > 49) { switch (me->GetEntry()) { @@ -1001,7 +1001,7 @@ public: AddGossipItemFor(player, GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //TAILORING SPEC - if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 350 && player->getLevel() > 59) + if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 350 && player->GetLevel() > 59) { if (player->GetQuestRewardStatus(10831) || player->GetQuestRewardStatus(10832) || player->GetQuestRewardStatus(10833)) { diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index fb11baa063c..dade8cb14be 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1704,11 +1704,11 @@ class npc_tournament_mount : public CreatureScript case NPC_ARGENT_WARHORSE: { if (player->HasAchieved(ACHIEVEMENT_CHAMPION_ALLIANCE) || player->HasAchieved(ACHIEVEMENT_CHAMPION_HORDE)) - return player->getClass() == CLASS_DEATH_KNIGHT ? SPELL_PENNANT_EBON_BLADE_CHAMPION : SPELL_PENNANT_ARGENT_CRUSADE_CHAMPION; + return player->GetClass() == CLASS_DEATH_KNIGHT ? SPELL_PENNANT_EBON_BLADE_CHAMPION : SPELL_PENNANT_ARGENT_CRUSADE_CHAMPION; else if (player->HasAchieved(ACHIEVEMENT_ARGENT_VALOR)) - return player->getClass() == CLASS_DEATH_KNIGHT ? SPELL_PENNANT_EBON_BLADE_VALIANT : SPELL_PENNANT_ARGENT_CRUSADE_VALIANT; + return player->GetClass() == CLASS_DEATH_KNIGHT ? SPELL_PENNANT_EBON_BLADE_VALIANT : SPELL_PENNANT_ARGENT_CRUSADE_VALIANT; else - return player->getClass() == CLASS_DEATH_KNIGHT ? SPELL_PENNANT_EBON_BLADE_ASPIRANT : SPELL_PENNANT_ARGENT_CRUSADE_ASPIRANT; + return player->GetClass() == CLASS_DEATH_KNIGHT ? SPELL_PENNANT_EBON_BLADE_ASPIRANT : SPELL_PENNANT_ARGENT_CRUSADE_ASPIRANT; } default: return 0; |