aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2019-07-01 21:36:32 +0200
committerccrs <ccrs@users.noreply.github.com>2019-07-01 21:36:32 +0200
commit401777d024785c58f90947cfdadd9b1b7d8fbd3b (patch)
tree6a04418719d5fdaa519258a601a91ce073d1444b /src/server/scripts
parente9004f9c905247f2240c3ca6e168bf9b858bf380 (diff)
Core/Unit: rename several getters to follow codestyle
uint8 GetLevel() uint8 GetLevelForTarget(WorldObject const* /*target*/) void SetLevel(uint8 lvl) uint8 GetRace() uint32 GetRaceMask() uint8 GetClass() uint32 GetClassMask() uint8 GetGender()
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Commands/cs_character.cpp6
-rw-r--r--src/server/scripts/Commands/cs_learn.cpp6
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp8
-rw-r--r--src/server/scripts/Commands/cs_modify.cpp6
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp4
-rw-r--r--src/server/scripts/Commands/cs_pet.cpp14
-rw-r--r--src/server/scripts/Commands/cs_reset.cpp10
-rw-r--r--src/server/scripts/Commands/cs_titles.cpp6
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp2
-rw-r--r--src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp2
-rw-r--r--src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp2
-rw-r--r--src/server/scripts/Pet/pet_dk.cpp4
-rw-r--r--src/server/scripts/Pet/pet_hunter.cpp2
-rw-r--r--src/server/scripts/Spells/spell_dk.cpp12
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp20
-rw-r--r--src/server/scripts/Spells/spell_holiday.cpp8
-rw-r--r--src/server/scripts/Spells/spell_hunter.cpp2
-rw-r--r--src/server/scripts/Spells/spell_item.cpp22
-rw-r--r--src/server/scripts/Spells/spell_paladin.cpp4
-rw-r--r--src/server/scripts/Spells/spell_pet.cpp8
-rw-r--r--src/server/scripts/Spells/spell_priest.cpp2
-rw-r--r--src/server/scripts/Spells/spell_quest.cpp2
-rw-r--r--src/server/scripts/Spells/spell_shaman.cpp2
-rw-r--r--src/server/scripts/World/duel_reset.cpp4
-rw-r--r--src/server/scripts/World/go_scripts.cpp2
-rw-r--r--src/server/scripts/World/item_scripts.cpp4
-rw-r--r--src/server/scripts/World/npc_professions.cpp10
-rw-r--r--src/server/scripts/World/npcs_special.cpp6
35 files changed, 100 insertions, 100 deletions
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;