From 4e6c59dca78ce563c327ea3106d0ff6786b1e127 Mon Sep 17 00:00:00 2001 From: ccrs Date: Mon, 1 Jul 2019 21:36:32 +0200 Subject: 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() (cherry picked from commit 5c09ff51f7015b775def8d5cc1f678eaef37200f) --- .../BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp | 2 +- .../BlackrockMountain/BlackwingLair/boss_nefarian.cpp | 2 +- .../scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/scripts/EasternKingdoms') 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 fcfeb69fa0c..c642be5f59c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -593,7 +593,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 742b76f3913..7681f1a0cb6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -513,7 +513,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 fb2d4f28b24..002b7703a99 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -624,7 +624,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); @@ -953,7 +953,7 @@ public: void JustSummoned(Creature* summoned) override { summoned->SetFaction(me->GetFaction()); - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); } void JustEngagedWith(Unit* who) override @@ -1046,7 +1046,7 @@ public: void JustSummoned(Creature* summoned) override { summoned->SetFaction(me->GetFaction()); - summoned->SetLevel(me->getLevel()); + summoned->SetLevel(me->GetLevel()); } void UpdateAI(uint32 diff) override @@ -1327,7 +1327,7 @@ public: if ((victimClass == 0) && me->GetVictim()) { - victimClass = me->EnsureVictim()->getClass(); + victimClass = me->EnsureVictim()->GetClass(); switch (victimClass) { case CLASS_DRUID: -- cgit v1.2.3