Core: Fix warnings and some cleanup

1 files changed, 6 insertions, 7 deletions

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 009a1afd9bb..25a969c788e 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -3602,14 +3602,13 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader
 };
 
 enum SpectatorCheerTrigger
-
 {
     EMOTE_ONE_SHOT_CHEER        = 4,
     EMOTE_ONE_SHOT_EXCLAMATION  = 5,
     EMOTE_ONE_SHOT_APPLAUD      = 21
 };
 
-uint8 const EmoteArray [3] = { EMOTE_ONE_SHOT_CHEER, EMOTE_ONE_SHOT_EXCLAMATION, EMOTE_ONE_SHOT_APPLAUD };
+uint8 const EmoteArray[3] = { EMOTE_ONE_SHOT_CHEER, EMOTE_ONE_SHOT_EXCLAMATION, EMOTE_ONE_SHOT_APPLAUD };
 
 class spell_gen_spectator_cheer_trigger : public SpellScriptLoader
 {
@@ -3620,10 +3619,9 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader
         {
             PrepareSpellScript(spell_gen_spectator_cheer_trigger_SpellScript)
 
-            void HandleDummy(SpellEffIndex /* effIndex */)
+            void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                if (Unit* caster = GetCaster())
-                    caster->HandleEmoteCommand(EmoteArray [urand(0,2)]);
+                GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]);
             }
 
             void Register()
@@ -3638,6 +3636,7 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader
         }
 
 };
+
 enum VendorBarkTrigger
 
 {
@@ -3755,6 +3754,6 @@ void AddSC_generic_spell_scripts()
     new spell_gen_aura_service_uniform();
     new spell_gen_orc_disguise();
     new spell_gen_whisper_gulch_yogg_saron_whisper();
-    new spell_gen_spectator_cheer_trigger;
-    new spell_gen_vendor_bark_trigger;
+    new spell_gen_spectator_cheer_trigger();
+    new spell_gen_vendor_bark_trigger();
 }