diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2019-06-26 08:56:20 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-13 00:42:17 +0100 |
| commit | 30cec73c6106d2f0879a11731afdd840e6bc0bcd (patch) | |
| tree | fe8b774798c251950495259b512d1ad109a267d1 /src/server/scripts | |
| parent | c9d52c954793404af02f75af97390d7c82c433ff (diff) | |
Coding standards (#23514)
* Coding standards
* revert part
(cherry picked from commit fe744977c917957e112704ccd66e228b826b3f7a)
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Commands/cs_gm.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/BlackTemple/boss_illidan.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_nagrand.cpp | 148 |
3 files changed, 76 insertions, 76 deletions
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 9c076691a18..991105ed32d 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -100,7 +100,7 @@ public: if (!*args) return false; - Player* target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) target = handler->GetSession()->GetPlayer(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 640fe275c61..98ca41b064e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -2320,7 +2320,7 @@ class spell_maiev_down : public AuraScript } }; -// 40693 - Cage Trap +// 40693 - Cage Trap class spell_illidan_cage_teleport : public SpellScript { PrepareSpellScript(spell_illidan_cage_teleport); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 159cfaede33..4b166ba9586 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -222,23 +222,23 @@ public: enum CorkiData { - // first quest - QUEST_HELP = 9923, - NPC_CORKI = 18445, - NPC_CORKI_CREDIT_1 = 18369, - GO_CORKIS_PRISON = 182349, - CORKI_SAY_THANKS = 0, - // 2nd quest - QUEST_CORKIS_GONE_MISSING_AGAIN = 9924, - NPC_CORKI_2 = 20812, - GO_CORKIS_PRISON_2 = 182350, - CORKI_SAY_PROMISE = 0, - // 3rd quest - QUEST_CHOWAR_THE_PILLAGER = 9955, - NPC_CORKI_3 = 18369, - NPC_CORKI_CREDIT_3 = 18444, - GO_CORKIS_PRISON_3 = 182521, - CORKI_SAY_LAST = 0 + // first quest + QUEST_HELP = 9923, + NPC_CORKI = 18445, + NPC_CORKI_CREDIT_1 = 18369, + GO_CORKIS_PRISON = 182349, + CORKI_SAY_THANKS = 0, + // 2nd quest + QUEST_CORKIS_GONE_MISSING_AGAIN = 9924, + NPC_CORKI_2 = 20812, + GO_CORKIS_PRISON_2 = 182350, + CORKI_SAY_PROMISE = 0, + // 3rd quest + QUEST_CHOWAR_THE_PILLAGER = 9955, + NPC_CORKI_3 = 18369, + NPC_CORKI_CREDIT_3 = 18444, + GO_CORKIS_PRISON_3 = 182521, + CORKI_SAY_LAST = 0 }; class go_corkis_prison : public GameObjectScript @@ -295,63 +295,63 @@ public: class npc_corki : public CreatureScript { public: - npc_corki() : CreatureScript("npc_corki") { } - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_corkiAI(creature); - } - - struct npc_corkiAI : public ScriptedAI - { - npc_corkiAI(Creature* creature) : ScriptedAI(creature) - { - Initialize(); - } - - void Initialize() - { - Say_Timer = 5000; - ReleasedFromCage = false; - } - - uint32 Say_Timer; - bool ReleasedFromCage; - - void Reset() override - { - Initialize(); - } - - void UpdateAI(uint32 diff) override - { - if (ReleasedFromCage) - { - if (Say_Timer <= diff) - { - me->DespawnOrUnsummon(); - ReleasedFromCage = false; - } - else - Say_Timer -= diff; - } - } - - void MovementInform(uint32 type, uint32 id) override - { - if (type == POINT_MOTION_TYPE && id == 1) - { - Say_Timer = 5000; - ReleasedFromCage = true; - if (me->GetEntry() == NPC_CORKI) - Talk(CORKI_SAY_THANKS); - if (me->GetEntry() == NPC_CORKI_2) - Talk(CORKI_SAY_PROMISE); - if (me->GetEntry() == NPC_CORKI_3) - Talk(CORKI_SAY_LAST); - } - }; - }; + npc_corki() : CreatureScript("npc_corki") { } + + CreatureAI* GetAI(Creature* creature) const override + { + return new npc_corkiAI(creature); + } + + struct npc_corkiAI : public ScriptedAI + { + npc_corkiAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + Say_Timer = 5000; + ReleasedFromCage = false; + } + + uint32 Say_Timer; + bool ReleasedFromCage; + + void Reset() override + { + Initialize(); + } + + void UpdateAI(uint32 diff) override + { + if (ReleasedFromCage) + { + if (Say_Timer <= diff) + { + me->DespawnOrUnsummon(); + ReleasedFromCage = false; + } + else + Say_Timer -= diff; + } + } + + void MovementInform(uint32 type, uint32 id) override + { + if (type == POINT_MOTION_TYPE && id == 1) + { + Say_Timer = 5000; + ReleasedFromCage = true; + if (me->GetEntry() == NPC_CORKI) + Talk(CORKI_SAY_THANKS); + if (me->GetEntry() == NPC_CORKI_2) + Talk(CORKI_SAY_PROMISE); + if (me->GetEntry() == NPC_CORKI_3) + Talk(CORKI_SAY_LAST); + } + }; + }; }; /*##### |
