Core/Misc: more warning fixes (some of them were real logical flaws - comparison of unrelated types) (Thanks to Tassader for pointing out that one line was completely unnecessary)

6 files changed, 15 insertions, 19 deletions

diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
index 2d9e95d8d33..6044672e225 100644
--- a/src/server/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
@@ -145,7 +145,7 @@ public:
 class GlyphChatLink : public SpellChatLink
 {
 public:
-    GlyphChatLink() : SpellChatLink(), _glyph(NULL), _slotId(0) { }
+    GlyphChatLink() : SpellChatLink(), _slotId(0), _glyph(NULL) { }
     virtual bool Initialize(std::istringstream& iss);
 private:
     uint32 _slotId;
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index 2e9cf6ab6f4..bcc1266c9fa 100755
--- a/src/server/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
@@ -204,7 +204,7 @@ bool SpellScript::UnitTargetHandler::CheckEffect(SpellEntry const* spellEntry, u
 {
     if (!targetType)
         return false;
-    return (effIndex == SPELL_EFFECT_ANY) || (spellEntry->EffectImplicitTargetA[effIndex] == targetType || spellEntry->EffectImplicitTargetB[effIndex] == targetType);
+    return (effIndex == EFFECT_ALL) || (spellEntry->EffectImplicitTargetA[effIndex] == targetType || spellEntry->EffectImplicitTargetB[effIndex] == targetType);
 }
 
 void SpellScript::UnitTargetHandler::Call(SpellScript* spellScript, std::list<Unit*>& unitTargets)
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index cc124c28a88..cbfea3b81bd 100755
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -196,7 +196,7 @@ void GmTicket::TeleportTo(Player* player) const
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Ticket manager
-TicketMgr::TicketMgr() : _lastTicketId(0), _lastSurveyId(0), _openTicketCount(0), _lastChange(time(NULL)), _status(true) { }
+TicketMgr::TicketMgr() : _status(true), _lastTicketId(0), _lastSurveyId(0), _openTicketCount(0), _lastChange(time(NULL)) { }
 
 void TicketMgr::Initialize() { SetStatus(sWorld->getBoolConfig(CONFIG_ALLOW_TICKETS)); }
 
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index cf28c7a39fc..30253c78260 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1022,18 +1022,15 @@ public:
             if (!instance)
                 return;
 
-            if (Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
+            if (Unit* summoner = me->ToTempSummon()->GetSummoner())
             {
-                if (Unit* summoner = me->ToTempSummon()->GetSummoner())
+                if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
                 {
                     summoner->CastSpell(me, SPELL_RIDE_RED_DRAGON, true);
-                    if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
-                    {
-                        float victim_threat = malygos->getThreatManager().getThreat(summoner);
-                        malygos->getThreatManager().resetAllAggro();
-                        malygos->AI()->AttackStart(me);
-                        malygos->AddThreat(me, victim_threat);
-                    }
+                    float victim_threat = malygos->getThreatManager().getThreat(summoner);
+                    malygos->getThreatManager().resetAllAggro();
+                    malygos->AI()->AttackStart(me);
+                    malygos->AddThreat(me, victim_threat);
                 }
             }
         }
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
index 978718e3252..63e01cf8dbb 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -745,14 +745,11 @@ class spell_shield_of_runes : public SpellScriptLoader
         {
             PrepareAuraScript(spell_shield_of_runes_AuraScript);
 
-            void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode)
+            void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
-                Unit* caster = GetCaster();
-                if (!caster)
-                    return;
-
-                if (mode != AURA_REMOVE_BY_EXPIRE)
-                    caster->CastSpell(caster, SPELL_SHIELD_OF_RUNES_BUFF, false);
+                if (Unit* caster = GetCaster())
+                    if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
+                        caster->CastSpell(caster, SPELL_SHIELD_OF_RUNES_BUFF, false);
             }
 
             void Register()
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
index b4daa8bc799..990ed9f4f02 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
@@ -489,6 +489,8 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader
                     case RAID_DIFFICULTY_25MAN_NORMAL:
                         target->RemoveAura(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_1));
                         break;
+                    default:
+                        break;
                 }
             }