[8830] Restore build at *nix. Make MAKE_PAIR* users includes explicit.

Comment for recently added field also.

src/game/AccountMgr.cpp

@@ -19,6 +19,7 @@
 #include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectAccessor.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "Policies/SingletonImp.h"
 #include "Util.h"

src/game/ArenaTeam.cpp

@@ -18,6 +18,7 @@
 
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "ArenaTeam.h"
 #include "World.h"
 

src/game/AuctionHouseHandler.cpp

@@ -22,6 +22,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "AuctionHouseMgr.h"

src/game/AuctionHouseMgr.cpp

@@ -28,6 +28,7 @@
 #include "Language.h"
 #include "Log.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "World.h"
 #include "WorldPacket.h"

src/game/BattleGround.cpp

@@ -27,6 +27,7 @@
 #include "ArenaTeam.h"
 #include "World.h"
 #include "Group.h"
+#include "ObjectDefines.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "Util.h"

src/game/CharacterHandler.cpp

@@ -25,6 +25,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "Guild.h"
 #include "UpdateMask.h"

src/game/Chat.cpp

@@ -25,6 +25,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Chat.h"

src/game/Corpse.cpp

@@ -21,6 +21,7 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "ObjectAccessor.h"
+#include "ObjectDefines.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "GossipDef.h"

src/game/Creature.cpp

@@ -21,6 +21,7 @@
 #include "WorldPacket.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "QuestDef.h"

src/game/GMTicketMgr.cpp

@@ -21,6 +21,7 @@
 #include "Database/SQLStorage.h"
 #include "GMTicketMgr.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "Player.h"

src/game/GameEventMgr.cpp

@@ -19,6 +19,7 @@
 #include "GameEventMgr.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "PoolManager.h"
 #include "ProgressBar.h"
 #include "Language.h"

src/game/Group.cpp

@@ -23,6 +23,7 @@
 #include "Player.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Group.h"
 #include "Formulas.h"
 #include "ObjectAccessor.h"

src/game/Guild.h

@@ -22,7 +22,9 @@
 #define WITHDRAW_MONEY_UNLIMITED    0xFFFFFFFF
 #define WITHDRAW_SLOT_UNLIMITED     0xFFFFFFFF
 
+#include "Common.h"
 #include "Item.h"
+#include "ObjectDefines.h"
 
 class Item;
 

src/game/InstanceSaveMgr.h

@@ -27,6 +27,7 @@
 #include "Utilities/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
+#include "ObjectDefines.h"
 
 struct InstanceTemplate;
 struct MapEntry;

src/game/Item.cpp

@@ -19,6 +19,7 @@
 #include "Common.h"
 #include "Item.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"

src/game/Level2.cpp

@@ -19,6 +19,7 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "Item.h"
 #include "GameObject.h"

src/game/LootHandler.cpp

@@ -23,6 +23,7 @@
 #include "GameObject.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
+#include "ObjectDefines.h"
 #include "WorldSession.h"
 #include "LootMgr.h"
 #include "Object.h"

src/game/Mail.cpp

@@ -23,6 +23,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Unit.h"

src/game/MiscHandler.cpp

@@ -26,6 +26,7 @@
 #include "Player.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "WorldSession.h"
 #include "Auth/BigNumber.h"
 #include "Auth/Sha1.h"

src/game/Object.cpp

@@ -27,6 +27,7 @@
 #include "Player.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include "Util.h"

src/game/ObjectMgr.cpp

@@ -25,6 +25,7 @@
 #include "Log.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "SpellMgr.h"
 #include "UpdateMask.h"
 #include "World.h"

src/game/PetitionsHandler.cpp

@@ -22,6 +22,7 @@
 #include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "Guild.h"

src/game/Player.cpp

@@ -42,6 +42,7 @@
 #include "CellImpl.h"
 #include "ObjectMgr.h"
 #include "ObjectAccessor.h"
+#include "ObjectDefines.h"
 #include "CreatureAI.h"
 #include "Formulas.h"
 #include "Group.h"

src/game/PoolManager.cpp

@@ -18,6 +18,7 @@
 
 #include "PoolManager.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"

src/game/QueryHandler.cpp

@@ -26,6 +26,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "NPCHandler.h"

src/game/SocialMgr.cpp

@@ -23,6 +23,7 @@
 #include "WorldPacket.h"
 #include "Player.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "World.h"
 #include "Util.h"
 

src/game/Transports.cpp

@@ -21,6 +21,7 @@
 #include "Transports.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "Path.h"
 
 #include "WorldPacket.h"

src/game/Unit.cpp

@@ -23,6 +23,7 @@
 #include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "SpellMgr.h"
 #include "Unit.h"
 #include "QuestDef.h"

src/game/WorldSession.h

@@ -750,7 +750,7 @@ class MANGOS_DLL_SPEC WorldSession
         bool m_playerLoading;                               // code processed in LoginPlayer
         bool m_playerLogout;                                // code processed in LogoutPlayer
         bool m_playerRecentlyLogout;
-        bool m_playerSave;
+        bool m_playerSave;                                  // code processed in LogoutPlayer with save request
         LocaleConstant m_sessionDbcLocale;
         int m_sessionDbLocaleIndex;
         uint32 m_latency;

src/game/debugcmds.cpp

@@ -30,6 +30,7 @@
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
+#include "ObjectDefines.h"
 #include "SpellMgr.h"
 
 bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args)

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8829"
+ #define REVISION_NR "8830"
 #endif // __REVISION_NR_H__