Warning Fixes

Code Style cleanup
Fix linux compile

--HG--
branch : trunk

src/game/AchievementMgr.cpp

@@ -1993,7 +1993,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
         m_AchievementCriteriasByType[criteria->requiredType].push_back(criteria);
         m_AchievementCriteriaListByAchievement[criteria->referredAchievement].push_back(criteria);
 
-        if(criteria->timeLimit)
+        if (criteria->timeLimit)
             m_AchievementCriteriasByTimedType[criteria->timedType].push_back(criteria);
     }
 

src/game/CombatAI.cpp

@@ -20,6 +20,7 @@
 
 #include "CombatAI.h"
 #include "SpellMgr.h"
+#include "Vehicle.h"
 
 int AggressorAI::Permissible(const Creature *creature)
 {
@@ -292,7 +293,7 @@ void AOEAI::UpdateAI(const uint32 /*diff*/)
 //////////////
 
 //NOTE: VehicleAI::UpdateAI runs even while the vehicle is mounted
-void VehicleAI::UpdateAI(const uint32 diff)
+void VehicleAI::UpdateAI(const uint32 /*diff*/)
 {
 }
 

src/game/SpellAuras.cpp

@@ -558,9 +558,14 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
     Player * modOwner = NULL;
     if (caster)
     {
-        if ((modOwner = caster->GetSpellModOwner()) && (modSpell = modOwner->FindCurrentSpellBySpellId(GetId())))
+        modOwner = caster->GetSpellModOwner();
+        if (modOwner)
+        {
+            modSpell = modOwner->FindCurrentSpellBySpellId(GetId());
+            if (modSpell)
                 modOwner->SetSpellModTakingSpell(modSpell, true);
         }
+    }
 
     Update(diff, caster);
 

src/scripts/world/npcs_special.cpp

@@ -2185,7 +2185,7 @@ bool GossipHello_npc_locksmith(Player* pPlayer, Creature* pCreature)
     return true;
 }
 
-bool GossipSelect_npc_locksmith(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
+bool GossipSelect_npc_locksmith(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
 {
     switch(uiAction)
     {