From 172d33d5078503220f181772b26c02655f3b3340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Tue, 20 Jul 2021 09:55:31 +0200 Subject: [PATCH] refactor(Scripts/Events): code cleanup (part 6) (#6924) --- src/server/scripts/Events/brewfest.cpp | 10 +++++++--- src/server/scripts/Events/hallows_end.cpp | 4 +++- src/server/scripts/Events/love_in_air.cpp | 4 +++- src/server/scripts/Events/midsummer.cpp | 4 +++- src/server/scripts/Events/pilgrims_bounty.cpp | 4 +++- src/server/scripts/Events/winter_veil.cpp | 12 ++++++------ 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 921c56252..87b7def4d 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -1,4 +1,6 @@ -// Scripted by Xinef +/* + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "CellImpl.h" #include "GameEventMgr.h" @@ -1206,8 +1208,10 @@ public: break; } // just walking, fatiuge handling - if (Aura* aur = caster->GetAura(SPELL_RAM_FATIGUE)) - aur->ModStackAmount(-4); + if (Aura* fatigueAura = caster->GetAura(SPELL_RAM_FATIGUE)) + { + fatigueAura->ModStackAmount(-4); + } break; case 1: // One click to maintain speed, more to increase diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 7349abf4f..06a0a3181 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -1,4 +1,6 @@ -// Scripted by Xinef +/* + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "CellImpl.h" #include "GossipDef.h" diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index caba2c2de..f67f832bc 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -1,4 +1,6 @@ -// Scripted by Xinef +/* + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "Cell.h" #include "CellImpl.h" diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 53c0f2b36..cb2fc42fb 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -1,4 +1,6 @@ -// Scripted by Xinef +/* + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index c42476b1e..4a6fe43bd 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -1,4 +1,6 @@ -// Scripted by Xinef +/* + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "CombatAI.h" #include "PassiveAI.h" diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp index 72466642f..56c74181f 100644 --- a/src/server/scripts/Events/winter_veil.cpp +++ b/src/server/scripts/Events/winter_veil.cpp @@ -1,4 +1,6 @@ -// Scripted by Xinef +/* + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "GameEventMgr.h" #include "Player.h" @@ -83,11 +85,9 @@ public: if (target->HasAuraType(SPELL_AURA_TRANSFORM)) return; - uint32 spellId = 0; - if (target->getGender() == GENDER_MALE) - spellId = RAND(SPELL_WINTER_WONDERVOLT_RED_MAN, SPELL_WINTER_WONDERVOLT_GREEN_MAN); - else - spellId = RAND(SPELL_WINTER_WONDERVOLT_RED_WOMEN, SPELL_WINTER_WONDERVOLT_GREEN_WOMEN); + uint32 spellId = target->getGender() == GENDER_MALE + ? RAND(SPELL_WINTER_WONDERVOLT_RED_MAN, SPELL_WINTER_WONDERVOLT_GREEN_MAN) + : RAND(SPELL_WINTER_WONDERVOLT_RED_WOMEN, SPELL_WINTER_WONDERVOLT_GREEN_WOMEN); // cast target->CastSpell(target, spellId, true);