From fe1fae46ee640b7a91bdc8b9af038c54470d3903 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 18 Nov 2009 23:36:08 +0300 Subject: [PATCH] [8830] Restore build at *nix. Make MAKE_PAIR* users includes explicit. Comment for recently added field also. --- src/game/AccountMgr.cpp | 1 + src/game/ArenaTeam.cpp | 1 + src/game/AuctionHouseHandler.cpp | 1 + src/game/AuctionHouseMgr.cpp | 1 + src/game/BattleGround.cpp | 1 + src/game/CharacterHandler.cpp | 1 + src/game/Chat.cpp | 1 + src/game/Corpse.cpp | 1 + src/game/Creature.cpp | 1 + src/game/GMTicketMgr.cpp | 1 + src/game/GameEventMgr.cpp | 1 + src/game/Group.cpp | 1 + src/game/Guild.h | 2 ++ src/game/InstanceSaveMgr.h | 1 + src/game/Item.cpp | 1 + src/game/Level2.cpp | 1 + src/game/LootHandler.cpp | 1 + src/game/Mail.cpp | 1 + src/game/MiscHandler.cpp | 1 + src/game/Object.cpp | 1 + src/game/ObjectMgr.cpp | 1 + src/game/PetitionsHandler.cpp | 1 + src/game/Player.cpp | 1 + src/game/PoolManager.cpp | 1 + src/game/QueryHandler.cpp | 1 + src/game/SocialMgr.cpp | 1 + src/game/Transports.cpp | 1 + src/game/Unit.cpp | 1 + src/game/WorldSession.h | 2 +- src/game/debugcmds.cpp | 1 + src/shared/revision_nr.h | 2 +- 31 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index 1bb61b006..163477409 100644 --- a/src/game/AccountMgr.cpp +++ b/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" diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index 4464eef96..f33bb9da3 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -18,6 +18,7 @@ #include "WorldPacket.h" #include "ObjectMgr.h" +#include "ObjectDefines.h" #include "ArenaTeam.h" #include "World.h" diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index 7c131a1d7..565ba130f 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/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" diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 83fe25ef3..7243dd426 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/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" diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 46a889f1a..903485384 100644 --- a/src/game/BattleGround.cpp +++ b/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" diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index 815a48c5e..69cd034c5 100644 --- a/src/game/CharacterHandler.cpp +++ b/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" diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 90c883152..aba9ae072 100644 --- a/src/game/Chat.cpp +++ b/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" diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index e31a2d94f..572cb7bfc 100644 --- a/src/game/Corpse.cpp +++ b/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" diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index b5903a6ed..416ef1912 100644 --- a/src/game/Creature.cpp +++ b/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" diff --git a/src/game/GMTicketMgr.cpp b/src/game/GMTicketMgr.cpp index 17ed65c7b..50e88ebf6 100644 --- a/src/game/GMTicketMgr.cpp +++ b/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" diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 71557ad24..a29c48644 100644 --- a/src/game/GameEventMgr.cpp +++ b/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" diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 3656ea0d0..389884326 100644 --- a/src/game/Group.cpp +++ b/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" diff --git a/src/game/Guild.h b/src/game/Guild.h index ead843981..f75a86ae3 100644 --- a/src/game/Guild.h +++ b/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; diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index f457fe3de..1b5799092 100644 --- a/src/game/InstanceSaveMgr.h +++ b/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; diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 00bbe883b..2f5621414 100644 --- a/src/game/Item.cpp +++ b/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" diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index bc75ce542..38b1b883c 100644 --- a/src/game/Level2.cpp +++ b/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" diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index f607775f1..d96aef44e 100644 --- a/src/game/LootHandler.cpp +++ b/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" diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index 061bfbb99..e49e13a04 100644 --- a/src/game/Mail.cpp +++ b/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" diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index ee528e602..f21a0bcee 100644 --- a/src/game/MiscHandler.cpp +++ b/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" diff --git a/src/game/Object.cpp b/src/game/Object.cpp index c1e724804..72399164b 100644 --- a/src/game/Object.cpp +++ b/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" diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index b466f121e..3407fd9ce 100644 --- a/src/game/ObjectMgr.cpp +++ b/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" diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index b6b6e2476..41fe2b12c 100644 --- a/src/game/PetitionsHandler.cpp +++ b/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" diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 558a9d5e4..8cc3a5bc7 100644 --- a/src/game/Player.cpp +++ b/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" diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp index 7ea09abd8..f1c41ca11 100644 --- a/src/game/PoolManager.cpp +++ b/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" diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index 657ab2e27..89a72a476 100644 --- a/src/game/QueryHandler.cpp +++ b/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" diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index e4811f1df..d05546035 100644 --- a/src/game/SocialMgr.cpp +++ b/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" diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index 9494d86f9..e876e341b 100644 --- a/src/game/Transports.cpp +++ b/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" diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f08534bcf..b5eab8dfe 100644 --- a/src/game/Unit.cpp +++ b/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" diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 03899d068..d8e2eb07c 100644 --- a/src/game/WorldSession.h +++ b/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; diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp index 66a30084a..2d66fd18b 100644 --- a/src/game/debugcmds.cpp +++ b/src/game/debugcmds.cpp @@ -30,6 +30,7 @@ #include "BattleGroundMgr.h" #include #include "ObjectMgr.h" +#include "ObjectDefines.h" #include "SpellMgr.h" bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 303e3e9b9..ffaa521b8 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 "8829" + #define REVISION_NR "8830" #endif // __REVISION_NR_H__