[7330] Code warnings and style cleanups. Some bugs fixes. Author: VladimirMangos

    1) comparison singed and unsigned values
    2) redundent includes
    3) wrong constructor :-part field initilization
    4) unused not-/*name*/-guarded args in template/virtual functions that not required like args.
    5) explicitly list not implemented achievement types.

    Also bugs fixed:
    1) Drop wrong phase mask 0 check in WorldObject::InSamePhase.
    2) ArenaTeamMember::ModifyPersonalRating incorrect work with move points in negative with infinity values in result.
    3) ArenaTeam::SaveToDB code send uint64 value to string with arg format %u.

--HG--
branch : trunk

26 files changed, 213 insertions, 137 deletions

diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h
index 708b675eed4..0fbd9242e45 100644
--- a/dep/include/mersennetwister/MersenneTwister.h
+++ b/dep/include/mersennetwister/MersenneTwister.h
@@ -238,7 +238,7 @@ inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength )
     initialize(19650218UL);
     register int i = 1;
     register uint32 j = 0;
-    register int k = ( N > seedLength ? N : seedLength );
+    register int k = ( N > int(seedLength) ? N : int(seedLength) );
     for( ; k; --k )
     {
         state[i] =
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index 6b89cdbedba..45e05e73a1e 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -67,11 +67,11 @@ class TRINITY_DLL_DECL NGrid
     public:
 
         typedef Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> GridType;
-        NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true) :
-            i_gridId(id), i_cellstate(GRID_STATE_INVALID), i_x(x), i_y(y), i_GridObjectDataLoaded(false)
-            {
-                i_GridInfo = GridInfo(expiry, unload);
-            }
+        NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true)
+            : i_gridId(id), i_x(x), i_y(y), i_cellstate(GRID_STATE_INVALID), i_GridObjectDataLoaded(false)
+        {
+            i_GridInfo = GridInfo(expiry, unload);
+        }
 
         const GridType& operator()(unsigned short x, unsigned short y) const { return i_cells[x][y]; }
         GridType& operator()(unsigned short x, unsigned short y) { return i_cells[x][y]; }
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index 7b902869fcc..989c1be35d9 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -293,7 +293,7 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
             time_t date    = time_t(fields[2].GetUInt64());
 
             AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(id);
-            if(!criteria || criteria->timeLimit && date + criteria->timeLimit < time(NULL))
+            if (!criteria || (criteria->timeLimit && time_t(date + criteria->timeLimit) < time(NULL)))
                 continue;
 
             CriteriaProgress& progress = m_criteriaProgress[id];
@@ -401,8 +401,8 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
         if(!achievement)
             continue;
 
-        if(achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_HORDE && GetPlayer()->GetTeam() != HORDE ||
-            achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE)
+        if ((achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_HORDE    && GetPlayer()->GetTeam() != HORDE) ||
+            (achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE))
             continue;
 
         switch (type)
@@ -440,7 +440,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 for(QuestStatusMap::iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++)
                 {
                     Quest const* quest = objmgr.GetQuestTemplate(itr->first);
-                    if(itr->second.m_rewarded && quest->GetZoneOrSort() == achievementCriteria->complete_quests_in_zone.zoneID)
+                    if(itr->second.m_rewarded && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID)
                         counter++;
                 }
                 SetCriteriaProgress(achievementCriteria, counter);
@@ -650,6 +650,77 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                SetCriteriaProgress(achievementCriteria, 1, true);
                break;
            }
+           case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
+           case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
+           case ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE:
+           case ACHIEVEMENT_CRITERIA_TYPE_DEATH:
+           case ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON:
+           case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID:
+           case ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM:
+           case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
+           case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA:
+           case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
+           case ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA:
+           case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL:
+           case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING:
+           case ACHIEVEMENT_CRITERIA_TYPE_REACH_TEAM_RATING:
+           case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL:
+           case ACHIEVEMENT_CRITERIA_TYPE_OWN_RANK:
+           case ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM:
+           case ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS:
+           case ACHIEVEMENT_CRITERIA_TYPE_HK_RACE:
+           case ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE:
+           case ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE:
+           case ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS:
+           case ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM:
+           case ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_VENDORS:
+           case ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_TALENTS:
+           case ACHIEVEMENT_CRITERIA_TYPE_NUMBER_OF_TALENT_RESETS:
+           case ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD:
+           case ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_TRAVELLING:
+           case ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_AT_BARBER:
+           case ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_MAIL:
+           case ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY:
+           case ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT:
+           case ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL:
+           case ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT:
+           case ACHIEVEMENT_CRITERIA_TYPE_EARNED_PVP_TITLE:
+           case ACHIEVEMENT_CRITERIA_TYPE_LOSE_DUEL:
+           case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE:
+           case ACHIEVEMENT_CRITERIA_TYPE_GOLD_EARNED_BY_AUCTIONS:
+           case ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID:
+           case ACHIEVEMENT_CRITERIA_TYPE_WON_AUCTIONS:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_SOLD:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED:
+           case ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION:
+           case ACHIEVEMENT_CRITERIA_TYPE_GAIN_HONORED_REPUTATION:
+           case ACHIEVEMENT_CRITERIA_TYPE_KNOWN_FACTIONS:
+           case ACHIEVEMENT_CRITERIA_TYPE_LOOT_EPIC_ITEM:
+           case ACHIEVEMENT_CRITERIA_TYPE_RECEIVE_EPIC_ITEM:
+           case ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED:
+           case ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALTH:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_POWER:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_STAT:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_SPELLPOWER:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_ARMOR:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_RATING:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED:
+           case ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED:
+           case ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED:
+           case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED:
+           case ACHIEVEMENT_CRITERIA_TYPE_QUEST_ABANDONED:
+           case ACHIEVEMENT_CRITERIA_TYPE_FLIGHT_PATHS_TAKEN:
+           case ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE:
+           case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE:
+           case ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL:
+           case ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS:
+           case ACHIEVEMENT_CRITERIA_TYPE_TOTAL:
+               break;                                   // Not implemented yet :(
         }
         if(IsCompletedCriteria(achievementCriteria))
             CompletedCriteria(achievementCriteria);
@@ -682,27 +753,27 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
     switch(achievementCriteria->requiredType)
     {
         case ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL:
-            if(achievement->ID == 467 && GetPlayer()->getClass() != CLASS_SHAMAN ||
-                    achievement->ID == 466 && GetPlayer()->getClass() != CLASS_DRUID ||
-                    achievement->ID == 465 && GetPlayer()->getClass() != CLASS_PALADIN ||
-                    achievement->ID == 464 && GetPlayer()->getClass() != CLASS_PRIEST ||
-                    achievement->ID == 463 && GetPlayer()->getClass() != CLASS_WARLOCK ||
-                    achievement->ID == 462 && GetPlayer()->getClass() != CLASS_HUNTER ||
-                    achievement->ID == 461 && GetPlayer()->getClass() != CLASS_DEATH_KNIGHT ||
-                    achievement->ID == 460 && GetPlayer()->getClass() != CLASS_MAGE ||
-                    achievement->ID == 459 && GetPlayer()->getClass() != CLASS_WARRIOR ||
-                    achievement->ID == 458 && GetPlayer()->getClass() != CLASS_ROGUE ||
-
-                    achievement->ID == 1404 && GetPlayer()->getRace() != RACE_GNOME ||
-                    achievement->ID == 1405 && GetPlayer()->getRace() != RACE_BLOODELF ||
-                    achievement->ID == 1406 && GetPlayer()->getRace() != RACE_DRAENEI ||
-                    achievement->ID == 1407 && GetPlayer()->getRace() != RACE_DWARF ||
-                    achievement->ID == 1408 && GetPlayer()->getRace() != RACE_HUMAN ||
-                    achievement->ID == 1409 && GetPlayer()->getRace() != RACE_NIGHTELF ||
-                    achievement->ID == 1410 && GetPlayer()->getRace() != RACE_ORC ||
-                    achievement->ID == 1411 && GetPlayer()->getRace() != RACE_TAUREN ||
-                    achievement->ID == 1412 && GetPlayer()->getRace() != RACE_TROLL ||
-                    achievement->ID == 1413 && GetPlayer()->getRace() != RACE_UNDEAD_PLAYER )
+            if ((achievement->ID == 467 && GetPlayer()->getClass() != CLASS_SHAMAN     ) ||
+                (achievement->ID == 466 && GetPlayer()->getClass() != CLASS_DRUID      ) ||
+                (achievement->ID == 465 && GetPlayer()->getClass() != CLASS_PALADIN    ) ||
+                (achievement->ID == 464 && GetPlayer()->getClass() != CLASS_PRIEST     ) ||
+                (achievement->ID == 463 && GetPlayer()->getClass() != CLASS_WARLOCK    ) ||
+                (achievement->ID == 462 && GetPlayer()->getClass() != CLASS_HUNTER     ) ||
+                (achievement->ID == 461 && GetPlayer()->getClass() != CLASS_DEATH_KNIGHT)||
+                (achievement->ID == 460 && GetPlayer()->getClass() != CLASS_MAGE       ) ||
+                (achievement->ID == 459 && GetPlayer()->getClass() != CLASS_WARRIOR    ) ||
+                (achievement->ID == 458 && GetPlayer()->getClass() != CLASS_ROGUE      ) ||
+
+                (achievement->ID == 1404 && GetPlayer()->getRace() != RACE_GNOME       ) ||
+                (achievement->ID == 1405 && GetPlayer()->getRace() != RACE_BLOODELF    ) ||
+                (achievement->ID == 1406 && GetPlayer()->getRace() != RACE_DRAENEI     ) ||
+                (achievement->ID == 1407 && GetPlayer()->getRace() != RACE_DWARF       ) ||
+                (achievement->ID == 1408 && GetPlayer()->getRace() != RACE_HUMAN       ) ||
+                (achievement->ID == 1409 && GetPlayer()->getRace() != RACE_NIGHTELF    ) ||
+                (achievement->ID == 1410 && GetPlayer()->getRace() != RACE_ORC         ) ||
+                (achievement->ID == 1411 && GetPlayer()->getRace() != RACE_TAUREN      ) ||
+                (achievement->ID == 1412 && GetPlayer()->getRace() != RACE_TROLL       ) ||
+                (achievement->ID == 1413 && GetPlayer()->getRace() != RACE_UNDEAD_PLAYER) )
                 return false;
             return progress->counter >= achievementCriteria->reach_level.level;
         case ACHIEVEMENT_CRITERIA_TYPE_BUY_BANK_SLOT:
@@ -837,10 +908,9 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
     if(entry->timeLimit)
     {
         time_t now = time(NULL);
-        if(progress->date + entry->timeLimit < now)
-        {
+        if(time_t(progress->date + entry->timeLimit) < now)
             progress->counter = 1;
-        }
+
         // also it seems illogical, the timeframe will be extended at every criteria update
         progress->date = now;
     }
@@ -972,7 +1042,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
         barGoLink bar(1);
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outErrorDb(">> Loaded 0 achievement criteria.");
         return;
     }
@@ -1003,7 +1073,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
         barGoLink bar(1);
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 realm completed achievements . DB table `character_achievement` is empty.");
         return;
     }
@@ -1018,7 +1088,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
 
     delete result;
 
-    sLog.outString("");
+    sLog.outString();
     sLog.outString(">> Loaded %u realm completed achievements.",m_allCompletedAchievements.size());
 }
 
@@ -1035,7 +1105,7 @@ void AchievementGlobalMgr::LoadRewards()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outErrorDb(">> Loaded 0 achievement rewards. DB table `achievement_reward` is empty.");
         return;
     }
@@ -1144,7 +1214,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 achievement reward locale strings. DB table `locales_achievement_reward` is empty.");
         return;
     }
@@ -1174,7 +1244,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
                 int idx = objmgr.GetOrNewIndexForLocale(LocaleConstant(i));
                 if(idx >= 0)
                 {
-                    if(data.subject.size() <= idx)
+                    if(data.subject.size() <= size_t(idx))
                         data.subject.resize(idx+1);
 
                     data.subject[idx] = str;
@@ -1186,7 +1256,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
                 int idx = objmgr.GetOrNewIndexForLocale(LocaleConstant(i));
                 if(idx >= 0)
                 {
-                    if(data.text.size() <= idx)
+                    if(data.text.size() <= size_t(idx))
                         data.text.resize(idx+1);
 
                     data.text[idx] = str;
diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index 0e2ea0d341d..a556210d4c5 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -632,11 +632,13 @@ void ArenaTeam::SaveToDB()
 {
     // save team and member stats to db
     // called after a match has ended, or when calculating arena_points
+    CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("UPDATE arena_team_stats SET rating = '%u',games = '%u',played = '%u',rank = '%u',wins = '%u',wins2 = '%u' WHERE arenateamid = '%u'", stats.rating, stats.games_week, stats.games_season, stats.rank, stats.wins_week, stats.wins_season, GetId());
     for(MemberList::iterator itr = members.begin(); itr !=  members.end(); ++itr)
     {
-        CharacterDatabase.PExecute("UPDATE arena_team_member SET played_week = '%u', wons_week = '%u', played_season = '%u', wons_season = '%u', personal_rating = '%u' WHERE arenateamid = '%u' AND guid = '%u'", itr->games_week, itr->wins_week, itr->games_season, itr->wins_season, itr->personal_rating, Id, itr->guid);
+        CharacterDatabase.PExecute("UPDATE arena_team_member SET played_week = '%u', wons_week = '%u', played_season = '%u', wons_season = '%u', personal_rating = '%u' WHERE arenateamid = '%u' AND guid = '%u'", itr->games_week, itr->wins_week, itr->games_season, itr->wins_season, itr->personal_rating, Id, GUID_LOPART(itr->guid));
     }
+    CharacterDatabase.CommitTransaction();
 }
 
 void ArenaTeam::FinishWeek()
diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h
index ec79e305ba9..eb19c984f05 100644
--- a/src/game/ArenaTeam.h
+++ b/src/game/ArenaTeam.h
@@ -98,7 +98,7 @@ struct ArenaTeamMember
 
     void ModifyPersonalRating(Player* plr, int32 mod, uint32 slot)
     {
-        if (personal_rating + mod < 0)
+        if (int32(personal_rating) + mod < 0)
             personal_rating = 0;
         else
             personal_rating += mod;
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index 2786c21a9d5..e3b737c6278 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -290,7 +290,7 @@ void AuctionHouseMgr::LoadAuctionItems()
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 auction items");
         return;
     }
@@ -341,7 +341,7 @@ void AuctionHouseMgr::LoadAuctions()
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
         return;
     }
@@ -354,7 +354,7 @@ void AuctionHouseMgr::LoadAuctions()
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
         return;
     }
@@ -364,7 +364,7 @@ void AuctionHouseMgr::LoadAuctions()
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
         return;
     }
@@ -583,22 +583,22 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
 
         ItemPrototype const *proto = item->GetProto();
 
-        if (itemClass != (0xffffffff) && proto->Class != itemClass)
+        if (itemClass != 0xffffffff && proto->Class != itemClass)
             continue;
 
-        if (itemSubClass != (0xffffffff) && proto->SubClass != itemSubClass)
+        if (itemSubClass != 0xffffffff && proto->SubClass != itemSubClass)
             continue;
 
-        if (inventoryType != (0xffffffff) && proto->InventoryType != inventoryType)
+        if (inventoryType != 0xffffffff && proto->InventoryType != inventoryType)
             continue;
 
-        if (quality != (0xffffffff) && proto->Quality != quality)
+        if (quality != 0xffffffff && proto->Quality != quality)
             continue;
 
-        if( levelmin != (0x00) && (proto->RequiredLevel < levelmin || levelmax != (0x00) && proto->RequiredLevel > levelmax ) )
+        if (levelmin != 0x00 && (proto->RequiredLevel < levelmin || (levelmax != 0x00 && proto->RequiredLevel > levelmax)))
             continue;
 
-        if( usable != (0x00) && player->CanUseItem( item ) != EQUIP_ERR_OK )
+        if (usable != 0x00 && player->CanUseItem( item ) != EQUIP_ERR_OK)
             continue;
 
         std::string name = proto->Name1;
@@ -616,10 +616,10 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
             }
         }
 
-        if( !wsearchedname.empty() && !Utf8FitTo(name, wsearchedname) )
+        if (!wsearchedname.empty() && !Utf8FitTo(name, wsearchedname) )
             continue;
 
-        if ((count < 50) && (totalcount >= listfrom))
+        if (count < 50 && totalcount >= listfrom)
         {
             ++count;
             Aentry->BuildAuctionInfo(data);
diff --git a/src/game/Bag.h b/src/game/Bag.h
index 34f56439cea..1c341b5611d 100644
--- a/src/game/Bag.h
+++ b/src/game/Bag.h
@@ -24,10 +24,7 @@
 // Maximum 36 Slots ( (CONTAINER_END - CONTAINER_FIELD_SLOT_1)/2
 #define MAX_BAG_SIZE 36                                     // 2.0.12
 
-#include "Object.h"
 #include "ItemPrototype.h"
-#include "Unit.h"
-#include "Creature.h"
 #include "Item.h"
 
 class Bag : public Item
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index 270d20cdb31..fd93746ebfc 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -218,10 +218,11 @@ enum BattleGroundJoinError
 class BattleGroundScore
 {
     public:
-        BattleGroundScore() : KillingBlows(0), HonorableKills(0), Deaths(0), DamageDone(0), HealingDone(0), BonusHonor(0) {};
-        virtual ~BattleGroundScore()                        //virtual destructor is used when deleting score from scores map
-        {
-        };
+        BattleGroundScore() : KillingBlows(0), Deaths(0), HonorableKills(0),
+            BonusHonor(0), DamageDone(0), HealingDone(0)
+        {}
+        virtual ~BattleGroundScore() {}                     //virtual destructor is used when deleting score from scores map
+
         uint32 KillingBlows;
         uint32 Deaths;
         uint32 HonorableKills;
@@ -448,7 +449,7 @@ class BattleGround
         void DoorClose(uint32 type);
         const char *GetTrinityString(int32 entry);
 
-        virtual bool HandlePlayerUnderMap(Player * plr) {return false;}
+        virtual bool HandlePlayerUnderMap(Player * /*plr*/) { return false; }
 
         // since arenas can be AvA or Hvh, we have to get the "temporary" team of a player
         uint32 GetPlayerTeam(uint64 guid);
diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index 87ede40f0b0..8d61dd733ea 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -24,7 +24,7 @@
 #include "SocialMgr.h"
 
 Channel::Channel(const std::string& name, uint32 channel_id)
-: m_name(name), m_announce(true), m_moderate(false), m_channelId(channel_id), m_ownerGUID(0), m_password(""), m_flags(0)
+: m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id), m_ownerGUID(0)
 {
     // set special flags if built-in channel
     ChatChannelsEntry const* ch = GetChannelEntryFor(channel_id);
@@ -455,7 +455,7 @@ void Channel::List(Player* player)
 
             // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
             // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
-            if( plr && ( plr->GetSession()->GetSecurity() == SEC_PLAYER || gmInWhoList && plr->IsVisibleGloballyFor(player) ) )
+            if (plr && ( plr->GetSession()->GetSecurity() == SEC_PLAYER || (gmInWhoList && plr->IsVisibleGloballyFor(player))))
             {
                 data << uint64(i->first);
                 data << uint8(i->second.flags);             // flags seems to be changed...
@@ -693,12 +693,12 @@ void Channel::SendToOne(WorldPacket *data, uint64 who)
         plr->GetSession()->SendPacket(data);
 }
 
-void Channel::Voice(uint64 guid1, uint64 guid2)
+void Channel::Voice(uint64 /*guid1*/, uint64 /*guid2*/)
 {
 
 }
 
-void Channel::DeVoice(uint64 guid1, uint64 guid2)
+void Channel::DeVoice(uint64 /*guid1*/, uint64 /*guid2*/)
 {
 
 }
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 8970bf82822..d6f2cf0888d 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -457,7 +457,7 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         return;
     }
 
-    if(have_same_race && skipCinematics == 1 || skipCinematics == 2)
+    if ((have_same_race && skipCinematics == 1) || skipCinematics == 2)
         pNewChar->setCinematic(1);                          // not show intro
 
     // Player created, save it now
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 9244978868e..6c0e8a419ac 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -139,10 +139,10 @@ Unit(), i_AI(NULL), i_AI_possessed(NULL),
 lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupLeaderGUID(0),
 m_lootMoney(0), m_lootRecipient(0),
 m_deathTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(0.0f),
-m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isTotem(false), m_isVehicle(false), m_reactState(REACT_AGGRESSIVE),
-m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0),
-m_AlreadyCallAssistance(false), m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
-m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL),m_creatureInfo(NULL), m_DBTableGuid(0), m_formationID(0)
+m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isVehicle(false), m_isTotem(false),
+m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false),
+m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL),
+m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formationID(0)
 {
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp
index 68e934abc7c..4d8e8f8fd77 100644
--- a/src/game/Debugcmds.cpp
+++ b/src/game/Debugcmds.cpp
@@ -90,9 +90,6 @@ bool ChatHandler::HandleSetPoiCommand(const char* args)
         return false;
 
     uint32 icon = atol(icon_text);
-    if ( icon < 0 )
-        icon = 0;
-
     uint32 flags = atol(flags_text);
 
     sLog.outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags);
@@ -278,8 +275,7 @@ bool ChatHandler::HandleSendChatMsgCommand(const char* args)
 bool ChatHandler::HandleSendQuestPartyMsgCommand(const char* args)
 {
     uint32 msg = atol((char*)args);
-    if (msg >= 0)
-        m_session->GetPlayer()->SendPushToPartyResponse(m_session->GetPlayer(), msg);
+    m_session->GetPlayer()->SendPushToPartyResponse(m_session->GetPlayer(), msg);
     return true;
 }
 
@@ -296,8 +292,7 @@ bool ChatHandler::HandleGetLootRecipient(const char* /*args*/)
 bool ChatHandler::HandleSendQuestInvalidMsgCommand(const char* args)
 {
     uint32 msg = atol((char*)args);
-    if (msg >= 0)
-        m_session->GetPlayer()->SendCanTakeQuestResponse(msg);
+    m_session->GetPlayer()->SendCanTakeQuestResponse(msg);
     return true;
 }
 
@@ -640,11 +635,11 @@ bool ChatHandler::HandleSpawnVehicle(const char* args)
     return true;
 }
 
-bool ChatHandler::HandleSendLargePacketCommand(const char* args)
+bool ChatHandler::HandleSendLargePacketCommand(const char* /*args*/)
 {
     const char* stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. ";
     std::ostringstream ss;
-    while(strlen(ss.str().c_str()) < 128000)
+    while(ss.str().size() < 128000)
         ss << stuffingString;
     SendSysMessage(ss.str().c_str());
     return true;
diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp
index 713dbc69b19..e0aff678fa6 100644
--- a/src/game/GossipDef.cpp
+++ b/src/game/GossipDef.cpp
@@ -200,7 +200,7 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
     PointOfInterest const* poi = objmgr.GetPointOfInterest(poi_id);
     if(!poi)
     {
-        sLog.outErrorDb("Requested send not existed POI (Id: %u), ignore.");
+        sLog.outErrorDb("Requested send not existed POI (Id: %u), ignore.",poi_id);
         return;
     }
 
diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index bfc8b58a6d9..db1e700fe55 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -1034,7 +1034,7 @@ namespace Trinity
 
             ~LocalizedPacketDo()
             {
-                for(int i = 0; i < i_data_cache.size(); ++i)
+                for(size_t i = 0; i < i_data_cache.size(); ++i)
                     delete i_data_cache[i];
             }
             void operator()( Player* p );
diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp
index b138c33d9a6..bd1b1c610a6 100644
--- a/src/game/InstanceSaveMgr.cpp
+++ b/src/game/InstanceSaveMgr.cpp
@@ -142,9 +142,8 @@ void InstanceSaveManager::RemoveInstanceSave(uint32 InstanceId)
     }
 }
 
-InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, uint8 difficulty,
-                           time_t resetTime, bool canReset)
-: m_mapid(MapId), m_instanceid(InstanceId), m_resetTime(resetTime),
+InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, uint8 difficulty, time_t resetTime, bool canReset)
+: m_resetTime(resetTime), m_instanceid(InstanceId), m_mapid(MapId),
   m_difficulty(difficulty), m_canReset(canReset)
 {
 }
@@ -375,14 +374,14 @@ void InstanceSaveManager::LoadResetTimes()
     // get the current reset times for normal instances (these may need to be updated)
     // these are only kept in memory for InstanceSaves that are loaded later
     // resettime = 0 in the DB for raid/heroic instances so those are skipped
-    typedef std::map<uint32, std::pair<uint32, uint64> > ResetTimeMapType;
+    typedef std::map<uint32, std::pair<uint32, time_t> > ResetTimeMapType;
     ResetTimeMapType InstResetTime;
     QueryResult *result = CharacterDatabase.Query("SELECT id, map, resettime FROM instance WHERE resettime > 0");
     if( result )
     {
         do
         {
-            if(uint64 resettime = (*result)[2].GetUInt64())
+            if(time_t resettime = time_t((*result)[2].GetUInt64()))
             {
                 uint32 id = (*result)[0].GetUInt32();
                 uint32 mapid = (*result)[1].GetUInt32();
@@ -400,11 +399,11 @@ void InstanceSaveManager::LoadResetTimes()
             {
                 Field *fields = result->Fetch();
                 uint32 instance = fields[1].GetUInt32();
-                uint64 resettime = fields[0].GetUInt64() + 2 * HOUR;
+                time_t resettime = time_t(fields[0].GetUInt64() + 2 * HOUR);
                 ResetTimeMapType::iterator itr = InstResetTime.find(instance);
                 if(itr != InstResetTime.end() && itr->second.second != resettime)
                 {
-                    CharacterDatabase.DirectPExecute("UPDATE instance SET resettime = '"I64FMTD"' WHERE id = '%u'", resettime, instance);
+                    CharacterDatabase.DirectPExecute("UPDATE instance SET resettime = '"I64FMTD"' WHERE id = '%u'", uint64(resettime), instance);
                     itr->second.second = resettime;
                 }
             }
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index 7ffa5143786..a845ce29b50 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -350,14 +350,14 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         data << int32(pProto->Stackable);
         data << pProto->ContainerSlots;
         data << pProto->StatsCount;                         // item stats count
-        for(int i = 0; i < pProto->StatsCount; i++)
+        for(uint32 i = 0; i < pProto->StatsCount; ++i)
         {
             data << pProto->ItemStat[i].ItemStatType;
             data << pProto->ItemStat[i].ItemStatValue;
         }
         data << pProto->ScalingStatDistribution;            // scaling stats distribution
         data << pProto->ScalingStatValue;                   // some kind of flags used to determine stat values column
-        for(int i = 0; i < 5; i++)
+        for(int i = 0; i < 5; ++i)
         {
             data << pProto->Damage[i].DamageMin;
             data << pProto->Damage[i].DamageMax;
@@ -1137,7 +1137,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         return;
 
     //this slot is excepted when applying / removing meta gem bonus
-    uint8 slot = itemTarget->IsEquipped() ? itemTarget->GetSlot() : NULL_SLOT;
+    uint8 slot = itemTarget->IsEquipped() ? itemTarget->GetSlot() : uint8(NULL_SLOT);
 
     Item *Gems[MAX_GEM_SOCKETS];
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 0097da93525..8eb2a07b905 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -3553,7 +3553,7 @@ bool ChatHandler::HandleGuildInviteCommand(const char *args)
         plGuid = objmgr.GetPlayerGUIDByName (plName);
 
     if (!plGuid)
-        false;
+        return false;
 
     // player's guild membership checked in AddMember before add
     if (!targetGuild->AddMember (plGuid,targetGuild->GetLowestRank ()))
@@ -6985,8 +6985,6 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args)
         return false;
     }
 
-    uint32 mailId = objmgr.GenerateMailID();
-
     // from console show not existed sender
     uint32 sender_guidlo = m_session ? m_session->GetPlayer()->GetGUIDLow() : 0;
 
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index ac4a6fd18df..598b74e903f 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -210,9 +210,9 @@ void Map::DeleteStateMachine()
 }
 
 Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
-  : i_id(id), i_gridExpiry(expiry), i_mapEntry (sMapStore.LookupEntry(id)),
- i_InstanceId(InstanceId), i_spawnMode(SpawnMode), m_unloadTimer(0)
- , i_lock(false)
+  : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode),
+  i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0), i_gridExpiry(expiry)
+  , i_lock(false)
 {
     for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
     {
@@ -1641,8 +1641,9 @@ template void Map::Remove(DynamicObject *, bool);
 /* ******* Dungeon Instance Maps ******* */
 
 InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
-  : Map(id, expiry, InstanceId, SpawnMode), i_data(NULL),
-    m_resetAfterUnload(false), m_unloadWhenEmpty(false)
+  : Map(id, expiry, InstanceId, SpawnMode),
+    m_resetAfterUnload(false), m_unloadWhenEmpty(false),
+    i_data(NULL), i_script_id(0)
 {
     // the timer is started by default, and stopped when the first player joins
     // this make sure it gets unloaded if for some reason no player joins
diff --git a/src/game/Object.h b/src/game/Object.h
index 1d7749c3989..26b7df1e8d9 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -433,7 +433,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
         uint32 GetPhaseMask() const { return m_phaseMask; }
         bool InSamePhase(WorldObject const* obj) const { return InSamePhase(obj->GetPhaseMask()); }
-        bool InSamePhase(uint32 phasemask) const { return GetPhaseMask()==0 && phasemask==0 || (GetPhaseMask() & phasemask); }
+        bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask); }
 
         uint32 GetZoneId() const;
         uint32 GetAreaId() const;
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 7807f365a23..34cfa48c917 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -341,7 +341,7 @@ void ObjectMgr::LoadCreatureLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 creature locale strings. DB table `locales_creature` is empty.");
         return;
     }
@@ -409,7 +409,7 @@ void ObjectMgr::LoadNpcOptionLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 npc_option locale strings. DB table `locales_npc_option` is empty.");
         return;
     }
@@ -472,7 +472,7 @@ void ObjectMgr::LoadPointOfInterestLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 points_of_interest locale strings. DB table `locales_points_of_interest` is empty.");
         return;
     }
@@ -950,7 +950,7 @@ void ObjectMgr::LoadCreatures()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outErrorDb(">> Loaded 0 creature. DB table `creature` is empty.");
         return;
     }
@@ -1394,7 +1394,7 @@ void ObjectMgr::LoadItemLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 Item locale strings. DB table `locales_item` is empty.");
         return;
     }
@@ -3508,7 +3508,7 @@ void ObjectMgr::LoadQuestLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 Quest locale strings. DB table `locales_quest` is empty.");
         return;
     }
@@ -4145,7 +4145,7 @@ void ObjectMgr::LoadPageTextLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 PageText locale strings. DB table `locales_page_text` is empty.");
         return;
     }
@@ -4326,7 +4326,7 @@ void ObjectMgr::LoadNpcTextLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 Quest locale strings. DB table `locales_npc_text` is empty.");
         return;
     }
@@ -4394,7 +4394,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Only expired mails (need to be return or delete) or DB table `mail` is empty.");
         return;                                             // any mails need to be returned or deleted
     }
@@ -5440,7 +5440,7 @@ void ObjectMgr::LoadGameObjectLocales()
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 gameobject locale strings. DB table `locales_gameobject` is empty.");
         return;
     }
@@ -6030,19 +6030,19 @@ void ObjectMgr::LoadWeatherZoneChances()
             if(wzc.data[season].rainChance > 100)
             {
                 wzc.data[season].rainChance = 25;
-                sLog.outErrorDb("Weather for zone %u season %u has wrong rain chance > 100%",zone_id,season);
+                sLog.outErrorDb("Weather for zone %u season %u has wrong rain chance > 100%%",zone_id,season);
             }
 
             if(wzc.data[season].snowChance > 100)
             {
                 wzc.data[season].snowChance = 25;
-                sLog.outErrorDb("Weather for zone %u season %u has wrong snow chance > 100%",zone_id,season);
+                sLog.outErrorDb("Weather for zone %u season %u has wrong snow chance > 100%%",zone_id,season);
             }
 
             if(wzc.data[season].stormChance > 100)
             {
                 wzc.data[season].stormChance = 25;
-                sLog.outErrorDb("Weather for zone %u season %u has wrong storm chance > 100%",zone_id,season);
+                sLog.outErrorDb("Weather for zone %u season %u has wrong storm chance > 100%%",zone_id,season);
             }
         }
 
@@ -6518,7 +6518,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
 
         bar.step();
 
-        sLog.outString("");
+        sLog.outString();
         if(min_value == MIN_TRINITY_STRING_ID)               // error only in case internal strings
             sLog.outErrorDb(">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.",table);
         else
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 7cd59aba455..2fe81a3e98b 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -341,7 +341,7 @@ int32 GetSpellMaxDuration(SpellEntry const *spellInfo);
 inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect)
 {
     for(int i= 0; i < 3; ++i)
-        if(spellInfo->Effect[i]==effect)
+        if(SpellEffects(spellInfo->Effect[i])==effect)
             return true;
     return false;
 }
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 5b54cc013a4..c2c8c4bf403 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -634,7 +634,9 @@ enum DiminishingLevels
 
 struct DiminishingReturn
 {
-    DiminishingReturn(DiminishingGroup group, uint32 t, uint32 count) : DRGroup(group), hitTime(t), hitCount(count), stack(0) {}
+    DiminishingReturn(DiminishingGroup group, uint32 t, uint32 count)
+        : DRGroup(group), stack(0), hitTime(t), hitCount(count)
+    {}
 
     DiminishingGroup        DRGroup:16;
     uint16                  stack:16;
@@ -682,9 +684,11 @@ struct CalcDamageInfo
 
 // Spell damage info structure based on structure sending in SMSG_SPELLNONMELEEDAMAGELOG opcode
 struct SpellNonMeleeDamage{
- SpellNonMeleeDamage(Unit *_attacker, Unit *_target, uint32 _SpellID, uint32 _schoolMask) :
-    attacker(_attacker), target(_target), SpellID(_SpellID), damage(0), schoolMask(_schoolMask),
-    absorb(0), resist(0), phusicalLog(false), unused(false), blocked(0), HitInfo(0), cleanDamage(0) {}
+ SpellNonMeleeDamage(Unit *_attacker, Unit *_target, uint32 _SpellID, uint32 _schoolMask)
+    : target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), schoolMask(_schoolMask),
+    absorb(0), resist(0), phusicalLog(false), unused(false), blocked(0), HitInfo(0), cleanDamage(0)
+ {}
+
  Unit   *target;
  Unit   *attacker;
  uint32 SpellID;
diff --git a/src/game/World.cpp b/src/game/World.cpp
index cb9f2acf396..1c2f448ca1f 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -599,7 +599,11 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
         if(val!=m_configs[CONFIG_SOCKET_SELECTTIME])
+<<<<<<< HEAD:src/game/World.cpp
             sLog.outError("SocketSelectTime option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[DEFAULT_SOCKET_SELECT_TIME]);
+=======
+            sLog.outError("SocketSelectTime option can't be changed at mangosd.conf reload, using current value (%u).",m_configs[CONFIG_SOCKET_SELECTTIME]);
+>>>>>>> 76028880380c6f08320a1b55c2c9882741bf877a:src/game/World.cpp
     }
     else
         m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
@@ -659,7 +663,7 @@ void World::LoadConfigSettings(bool reload)
     }
 
     m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] = sConfig.GetIntDefault("HeroicCharactersPerRealm", 1);
-    if(m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] < 0 || m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] > 10)
+    if(int32(m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]) < 0 || m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] > 10)
     {
         sLog.outError("HeroicCharactersPerRealm (%i) must be in range 0..10. Set to 1.",m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]);
         m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] = 1;
@@ -668,7 +672,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_MIN_LEVEL_FOR_HEROIC_CHARACTER_CREATING] = sConfig.GetIntDefault("MinLevelForHeroicCharacterCreating", 55);
 
     m_configs[CONFIG_SKIP_CINEMATICS] = sConfig.GetIntDefault("SkipCinematics", 0);
-    if(m_configs[CONFIG_SKIP_CINEMATICS] < 0 || m_configs[CONFIG_SKIP_CINEMATICS] > 2)
+    if(int32(m_configs[CONFIG_SKIP_CINEMATICS]) < 0 || m_configs[CONFIG_SKIP_CINEMATICS] > 2)
     {
         sLog.outError("SkipCinematics (%i) must be in range 0..2. Set to 0.",m_configs[CONFIG_SKIP_CINEMATICS]);
         m_configs[CONFIG_SKIP_CINEMATICS] = 0;
@@ -716,7 +720,7 @@ void World::LoadConfigSettings(bool reload)
     }
 
     m_configs[CONFIG_START_PLAYER_MONEY] = sConfig.GetIntDefault("StartPlayerMoney", 0);
-    if(m_configs[CONFIG_START_PLAYER_MONEY] < 0)
+    if(int32(m_configs[CONFIG_START_PLAYER_MONEY]) < 0)
     {
         sLog.outError("StartPlayerMoney (%i) must be in range 0..%u. Set to %u.",m_configs[CONFIG_START_PLAYER_MONEY],MAX_MONEY_AMOUNT,0);
         m_configs[CONFIG_START_PLAYER_MONEY] = 0;
@@ -729,14 +733,14 @@ void World::LoadConfigSettings(bool reload)
     }
 
     m_configs[CONFIG_MAX_HONOR_POINTS] = sConfig.GetIntDefault("MaxHonorPoints", 75000);
-    if(m_configs[CONFIG_MAX_HONOR_POINTS] < 0)
+    if(int32(m_configs[CONFIG_MAX_HONOR_POINTS]) < 0)
     {
         sLog.outError("MaxHonorPoints (%i) can't be negative. Set to 0.",m_configs[CONFIG_MAX_HONOR_POINTS]);
         m_configs[CONFIG_MAX_HONOR_POINTS] = 0;
     }
 
     m_configs[CONFIG_START_HONOR_POINTS] = sConfig.GetIntDefault("StartHonorPoints", 0);
-    if(m_configs[CONFIG_START_HONOR_POINTS] < 0)
+    if(int32(m_configs[CONFIG_START_HONOR_POINTS]) < 0)
     {
         sLog.outError("StartHonorPoints (%i) must be in range 0..MaxHonorPoints(%u). Set to %u.",
             m_configs[CONFIG_START_HONOR_POINTS],m_configs[CONFIG_MAX_HONOR_POINTS],0);
@@ -750,14 +754,14 @@ void World::LoadConfigSettings(bool reload)
     }
 
     m_configs[CONFIG_MAX_ARENA_POINTS] = sConfig.GetIntDefault("MaxArenaPoints", 5000);
-    if(m_configs[CONFIG_MAX_ARENA_POINTS] < 0)
+    if(int32(m_configs[CONFIG_MAX_ARENA_POINTS]) < 0)
     {
         sLog.outError("MaxArenaPoints (%i) can't be negative. Set to 0.",m_configs[CONFIG_MAX_ARENA_POINTS]);
         m_configs[CONFIG_MAX_ARENA_POINTS] = 0;
     }
 
     m_configs[CONFIG_START_ARENA_POINTS] = sConfig.GetIntDefault("StartArenaPoints", 0);
-    if(m_configs[CONFIG_START_ARENA_POINTS] < 0)
+    if(int32(m_configs[CONFIG_START_ARENA_POINTS]) < 0)
     {
         sLog.outError("StartArenaPoints (%i) must be in range 0..MaxArenaPoints(%u). Set to %u.",
             m_configs[CONFIG_START_ARENA_POINTS],m_configs[CONFIG_MAX_ARENA_POINTS],0);
@@ -822,7 +826,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_MAIL_DELIVERY_DELAY] = sConfig.GetIntDefault("MailDeliveryDelay",HOUR);
 
     m_configs[CONFIG_UPTIME_UPDATE] = sConfig.GetIntDefault("UpdateUptimeInterval", 10);
-    if(m_configs[CONFIG_UPTIME_UPDATE]<=0)
+    if(int32(m_configs[CONFIG_UPTIME_UPDATE])<=0)
     {
         sLog.outError("UpdateUptimeInterval (%i) must be > 0, set to default 10.",m_configs[CONFIG_UPTIME_UPDATE]);
         m_configs[CONFIG_UPTIME_UPDATE] = 10;
@@ -1107,9 +1111,15 @@ void World::SetInitialWorldSettings()
     }
 
     ///- Loading strings. Getting no records means core load has to be canceled because no error message can be output.
+<<<<<<< HEAD:src/game/World.cpp
     sLog.outString( "" );
     sLog.outString( "Loading Trinity strings..." );
     if (!objmgr.LoadTrinityStrings())
+=======
+    sLog.outString();
+    sLog.outString("Loading MaNGOS strings...");
+    if (!objmgr.LoadMangosStrings())
+>>>>>>> 76028880380c6f08320a1b55c2c9882741bf877a:src/game/World.cpp
         exit(1);                                            // Error message displayed in function already
 
     ///- Update the realm entry in the database with the realm type from the config file
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 06247f810a6..6c94dbd8cb4 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -489,8 +489,7 @@ int WorldSocket::handle_input_header (void)
     EndianConvertReverse(header.size);
     EndianConvert(header.cmd);
 
-    if ((header.size < 4) || (header.size > 10240) ||
-        (header.cmd  < 0) || (header.cmd  > 10240) )
+    if ((header.size < 4) || (header.size > 10240) || (header.cmd  > 10240))
     {
         sLog.outError ("WorldSocket::handle_input_header: client sent mailformed packet size = %d , cmd = %d",
                        header.size, header.cmd);
@@ -734,7 +733,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
         }
         else
         {
-            sLog.outError ("WorldSocket::ProcessIncoming: Client not authed opcode = ", opcode);
+            sLog.outError ("WorldSocket::ProcessIncoming: Client not authed opcode = %u", uint32(opcode));
             return -1;
         }
     }
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index 6cb67832f02..b7927851fef 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -22,13 +22,13 @@
 
 template<class T>
 template<class S, class D>
-void SQLStorageLoaderBase<T>::convert(uint32 field_pos, S src, D &dst)
+void SQLStorageLoaderBase<T>::convert(uint32 /*field_pos*/, S src, D &dst)
 {
     dst = D(src);
 }
 
 template<class T>
-void SQLStorageLoaderBase<T>::convert_str_to_str(uint32 field_pos, char *src, char *&dst)
+void SQLStorageLoaderBase<T>::convert_str_to_str(uint32 /*field_pos*/, char *src, char *&dst)
 {
     if(!src)
     {
@@ -45,7 +45,7 @@ void SQLStorageLoaderBase<T>::convert_str_to_str(uint32 field_pos, char *src, ch
 
 template<class T>
 template<class S>
-void SQLStorageLoaderBase<T>::convert_to_str(uint32 field_pos, S src, char * & dst)
+void SQLStorageLoaderBase<T>::convert_to_str(uint32 /*field_pos*/, S /*src*/, char * & dst)
 {
     dst = new char[1];
     *dst = 0;
@@ -53,7 +53,7 @@ void SQLStorageLoaderBase<T>::convert_to_str(uint32 field_pos, S src, char * & d
 
 template<class T>
 template<class D>
-void SQLStorageLoaderBase<T>::convert_from_str(uint32 field_pos, char * src, D& dst)
+void SQLStorageLoaderBase<T>::convert_from_str(uint32 /*field_pos*/, char * /*src*/, D& dst)
 {
     dst = 0;
 }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f0ea8050dad..6817fb559ae 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7329"
+ #define REVISION_NR "7330"
 #endif // __REVISION_NR_H__