diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-04-28 02:24:04 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2020-04-29 01:36:41 +0200 |
| commit | 93c19c4194b7eb82984bd13349c8ce3953a9ad92 (patch) | |
| tree | af19c0a6cbd385102526ab71a8f29661189ffb6a /src/server/scripts/Outland/BlackTemple | |
| parent | 57b1d76ad50f39c61423518377e9ed5ecb267f89 (diff) | |
Core/Misc: camelize GetFaction/SetFaction properly
(cherry picked from commit 4c4dca6d694bd1064b403a31a5b1c776a326f3ce)
Diffstat (limited to 'src/server/scripts/Outland/BlackTemple')
| -rw-r--r-- | src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 610d12a377b..dc5d479bf58 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -384,7 +384,7 @@ public: void Reset() override { Initialize(); - me->setFaction(ASHTONGUE_FACTION_FRIEND); + me->SetFaction(ASHTONGUE_FACTION_FRIEND); DoCastSelf(SPELL_STEALTH); if (_instance->GetBossState(DATA_SHADE_OF_AKAMA) != DONE) @@ -430,7 +430,7 @@ public: { _isInCombat = false; me->CombatStop(true); - me->setFaction(ASHTONGUE_FACTION_FRIEND); + me->SetFaction(ASHTONGUE_FACTION_FRIEND); me->SetWalk(true); _events.Reset(); me->GetMotionMaster()->MovePoint(AKAMA_INTRO_WAYPOINT, AkamaWP[1]); @@ -484,7 +484,7 @@ public: case EVENT_SHADE_CHANNEL: me->SetFacingTo(FACE_THE_PLATFORM); DoCastSelf(SPELL_AKAMA_SOUL_CHANNEL); - me->setFaction(AKAMA_FACTION_COMBAT); + me->SetFaction(AKAMA_FACTION_COMBAT); _events.ScheduleEvent(EVENT_FIXATE, Seconds(5)); break; case EVENT_FIXATE: @@ -532,7 +532,7 @@ public: } } - if (me->getFaction() == AKAMA_FACTION_COMBAT) + if (me->GetFaction() == AKAMA_FACTION_COMBAT) { if (!UpdateVictim()) return; @@ -1170,7 +1170,7 @@ public: Talk(SAY_BROKEN_SPECIAL); break; case ACTION_BROKEN_HAIL: - me->setFaction(ASHTONGUE_FACTION_FRIEND); + me->SetFaction(ASHTONGUE_FACTION_FRIEND); Talk(SAY_BROKEN_HAIL); break; case ACTION_BROKEN_EMOTE: diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 8684879ac42..66600ccb4d0 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -128,7 +128,7 @@ class instance_black_temple : public InstanceMapScript case NPC_STORM_FURY: AshtongueGUIDs.emplace_back(creature->GetGUID()); if (GetBossState(DATA_SHADE_OF_AKAMA) == DONE) - creature->setFaction(ASHTONGUE_FACTION_FRIEND); + creature->SetFaction(ASHTONGUE_FACTION_FRIEND); break; default: break; @@ -175,7 +175,7 @@ class instance_black_temple : public InstanceMapScript if (state == DONE) for (ObjectGuid ashtongueGuid : AshtongueGUIDs) if (Creature* ashtongue = instance->GetCreature(ashtongueGuid)) - ashtongue->setFaction(ASHTONGUE_FACTION_FRIEND); + ashtongue->SetFaction(ASHTONGUE_FACTION_FRIEND); // no break case DATA_TERON_GOREFIEND: case DATA_GURTOGG_BLOODBOIL: |