5 files changed, 18 insertions, 15 deletions
diff --git a/src/scripts/kalimdor/ashenvale.cpp b/src/scripts/kalimdor/ashenvale.cpp
index 654e7ed3146..13e8f442048 100644
--- a/src/scripts/kalimdor/ashenvale.cpp
+++ b/src/scripts/kalimdor/ashenvale.cpp
@@ -323,7 +323,7 @@ struct npc_muglashAI : public npc_escortAI
         }
     }
 
-    void Aggro(Unit* pWho)
+    void Aggro(Unit* /*pWho*/)
     {
         if (HasEscortState(STATE_ESCORT_PAUSED))
         {
@@ -340,7 +340,7 @@ struct npc_muglashAI : public npc_escortAI
         m_bIsBrazierExtinguished = false;
     }
 
-    void JustDied(Unit* pKiller)
+    void JustDied(Unit* /*pKiller*/)
     {
         Player* pPlayer = GetPlayerForEscort();
         if (HasEscortState(STATE_ESCORT_ESCORTING))
@@ -420,7 +420,7 @@ bool QuestAccept_npc_muglash(Player* pPlayer, Creature* pCreature, const Quest*
 }
 
 
-bool GOHello_go_naga_brazier(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_naga_brazier(Player* /*pPlayer*/, GameObject* pGo)
 {
     if (Creature* pCreature = GetClosestCreatureWithEntry(pGo, NPC_MUGLASH, INTERACTION_DISTANCE*2))
     {
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
index 3feef804d3b..6de6578f7bb 100644
--- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
+++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
@@ -157,7 +157,7 @@ struct boss_anub_arakAI : public ScriptedAI
         return NULL;
     }
 
-    void EnterCombat(Unit *pWho)
+    void EnterCombat(Unit * /*pWho*/)
     {
         DoScriptText(SAY_AGGRO, me);
         if (pInstance)
@@ -323,7 +323,7 @@ struct boss_anub_arakAI : public ScriptedAI
         }
     }
     
-    void JustDied(Unit *pKiller)
+    void JustDied(Unit * /*pKiller*/)
     {
         DoScriptText(SAY_DEATH, me);
         lSummons.DespawnAll();
diff --git a/src/scripts/northrend/zuldrak.cpp b/src/scripts/northrend/zuldrak.cpp
index 29b293154c9..129f0be7c6a 100644
--- a/src/scripts/northrend/zuldrak.cpp
+++ b/src/scripts/northrend/zuldrak.cpp
@@ -1021,15 +1021,18 @@ enum eScourgeEnclosure
 
 bool GOHello_go_scourge_enclosure(Player *pPlayer, GameObject *pGO)
 {
-    Creature *pGymerDummy;
-    if (pPlayer->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE &&
-        (pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY,20.0f)))
+    
+    if (pPlayer->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE)
+    {
+        Creature *pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY,20.0f);
+        if (pGymerDummy)
         {
-                        pGO->UseDoorOrButton();
-                        pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(),pGymerDummy->GetGUID());
-                        pGymerDummy->CastSpell(pGymerDummy, 55529, true);
-                        pGymerDummy->DisappearAndDie();
+            pGO->UseDoorOrButton();
+            pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(),pGymerDummy->GetGUID());
+            pGymerDummy->CastSpell(pGymerDummy, 55529, true);
+            pGymerDummy->DisappearAndDie();
         }
+    }
     return true;
 }
 
diff --git a/src/scripts/outland/blades_edge_mountains.cpp b/src/scripts/outland/blades_edge_mountains.cpp
index 7d2b56d872d..f5b4539edaf 100644
--- a/src/scripts/outland/blades_edge_mountains.cpp
+++ b/src/scripts/outland/blades_edge_mountains.cpp
@@ -442,7 +442,7 @@ struct npc_ogre_bruteAI : public ScriptedAI
         }
     }
 
-    void MovementInform(uint32 type, uint32 id)
+    void MovementInform(uint32 /*type*/, uint32 id)
     {
         Player* pPlayer = Unit::GetPlayer(PlayerGUID);
         if (id == 1)
@@ -459,7 +459,7 @@ struct npc_ogre_bruteAI : public ScriptedAI
         }
     }
 
-    void UpdateAI(const uint32 diff)
+    void UpdateAI(const uint32 /*diff*/)
     {
         if (!UpdateVictim())
             return;
diff --git a/src/scripts/world/areatrigger_scripts.cpp b/src/scripts/world/areatrigger_scripts.cpp
index 05764a18ad3..9a75263d35c 100644
--- a/src/scripts/world/areatrigger_scripts.cpp
+++ b/src/scripts/world/areatrigger_scripts.cpp
@@ -191,7 +191,7 @@ enum eScentLarkorwi
     NPC_LARKORWI_MATE                           = 9683
 };
 
-bool AreaTrigger_at_scent_larkorwi(Player* pPlayer, const AreaTriggerEntry* pAt)
+bool AreaTrigger_at_scent_larkorwi(Player* pPlayer, const AreaTriggerEntry* /*pAt*/)
 {
     if (!pPlayer->isDead() && pPlayer->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE)
     {