Core: Header cleanup in game/*/*.cpp

(cherry picked from commit 2e586bc520e7eda2387e850c3c0049e6daa880de) Conflicts: src/server/game/Battlegrounds/Battleground.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp src/server/game/Chat/Chat.cpp src/server/game/Combat/ThreatManager.cpp src/server/game/DataStores/DB2Stores.cpp src/server/game/DataStores/DBCStores.cpp src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Creature/GossipDef.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/ObjectGuid.cpp src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Globals/ObjectAccessor.cpp src/server/game/Handlers/BankHandler.cpp src/server/game/Handlers/CombatHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/PetitionsHandler.cpp src/server/game/Handlers/QueryHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Handlers/TokenHandler.cpp src/server/game/Handlers/VoiceChatHandler.cpp src/server/game/Maps/Map.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Server/Packet.cpp src/server/game/Server/Packets/SpellPackets.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellScript.cpp src/server/game/Warden/Warden.cpp src/server/game/Warden/WardenWin.cpp src/server/game/Weather/WeatherMgr.cpp
2015-07-25 21:53:30 +01:00
1 parent f03f5cc1f2
commit d2d4bc2668
@@ -21,7 +21,6 @@
 #include "Log.h"
 #include "DatabaseEnv.h"
 #include "Language.h"
-#include "ObjectAccessor.h"
 #include "Player.h"

 ArenaTeamMgr::ArenaTeamMgr()
@@ -21,7 +21,6 @@
 #include "ObjectMgr.h"
 #include "WorldPacket.h"

-#include "Formulas.h"
 #include "GameObject.h"
 #include "Language.h"
 #include "Player.h"
@@ -18,7 +18,6 @@

 #include "BattlegroundDS.h"
 #include "Creature.h"
-#include "GameObject.h"
 #include "Player.h"
 #include "WorldPacket.h"

@@ -17,7 +17,6 @@
 */

 #include "BattlegroundEY.h"
-#include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "BattlegroundMgr.h"
 #include "Creature.h"
@@ -20,7 +20,6 @@
 #include "GameObject.h"
 #include "Language.h"
 #include "Object.h"
-#include "ObjectMgr.h"
 #include "BattlegroundMgr.h"
 #include "Player.h"
 #include "WorldPacket.h"
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "DatabaseEnv.h"

@@ -29,9 +28,7 @@
 #include "GridNotifiersImpl.h"
 #include "Language.h"
 #include "Log.h"
-#include "Opcodes.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "ScriptMgr.h"
 #include "ChatLink.h"

@@ -27,7 +27,6 @@
 #include "ScriptMgr.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
-#include "Spell.h"

 char const* ConditionMgr::StaticSourceTypeData[CONDITION_SOURCE_TYPE_MAX] =
 {
@@ -23,7 +23,6 @@
 #include "TransportMgr.h"
 #include "DBCfmt.h"
 #include "Timer.h"
-#include "ObjectDefines.h"

 #include <map>

@@ -36,7 +36,6 @@
 #include "LootMgr.h"
 #include "MoveSpline.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "PoolMgr.h"
 #include "QuestDef.h"
@@ -19,8 +19,6 @@
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Formulas.h"

@@ -16,17 +16,17 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stdlib.h>
-#include <functional>
 #include "ItemEnchantmentMgr.h"
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include <list>
-#include <vector>
 #include "Util.h"
 #include "DBCStores.h"

+#include <list>
+#include <vector>
+#include <stdlib.h>
+
 struct EnchStoreItem
 {
    uint32  ench;
@@ -18,6 +18,7 @@

 #include "ObjectGuid.h"
 #include "World.h"
+#include "ObjectMgr.h"
 #include <sstream>
 #include <iomanip>

@@ -17,9 +17,10 @@

 #include "Position.h"
 #include "ByteBuffer.h"
-#include "G3D/g3dmath.h"
 #include "GridDefines.h"

+#include <G3D/g3dmath.h>
+
 bool Position::operator==(Position const &a)
 {
    return (G3D::fuzzyEq(a.m_positionX, m_positionX) &&
@@ -20,7 +20,6 @@
 #include "ByteBuffer.h"
 #include "WorldPacket.h"
 #include "UpdateData.h"
-#include "Log.h"
 #include "Opcodes.h"
 #include "World.h"
 #include "zlib.h"
@@ -23,7 +23,6 @@
 #include "SharedDefines.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
-#include "SpellMgr.h"
 #include "World.h"

 inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
@@ -54,8 +54,8 @@
 #include "SpellHistory.h"
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
-#include "Totem.h"
 #include "Transport.h"
+#include "Totem.h"
 #include "UpdateFieldFlags.h"
 #include "Util.h"
 #include "Vehicle.h"
@@ -16,9 +16,6 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include <boost/thread/shared_mutex.hpp>
-#include <boost/thread/locks.hpp>
-
 #include "ObjectAccessor.h"
 #include "Corpse.h"
 #include "Creature.h"
@@ -32,7 +29,9 @@
 #include "Pet.h"
 #include "Player.h"
 #include "World.h"
-#include "WorldPacket.h"
+
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/thread/locks.hpp>

 ObjectAccessor::ObjectAccessor() { }

@@ -25,7 +25,6 @@
 #include "Common.h"
 #include "DatabaseEnv.h"
 #include "DisableMgr.h"
-#include "GameEventMgr.h"
 #include "GossipDef.h"
 #include "GroupMgr.h"
 #include "GuildMgr.h"
@@ -36,19 +35,15 @@
 #include "MapManager.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "Pet.h"
 #include "PoolMgr.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
 #include "SpellAuras.h"
-#include "Spell.h"
 #include "SpellMgr.h"
 #include "SpellScript.h"
-#include "Transport.h"
 #include "UpdateMask.h"
 #include "Util.h"
 #include "Vehicle.h"
-#include "WaypointManager.h"
 #include "World.h"

 ScriptMapMap sSpellScripts;
@@ -17,14 +17,9 @@
 */

 #include "Player.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "DatabaseEnv.h"
-
 #include "ArenaTeam.h"
-#include "Log.h"
-#include "ObjectMgr.h"
 #include "SocialMgr.h"
 #include "ArenaTeamMgr.h"
 #include "Opcodes.h"
@@ -25,7 +25,6 @@
 #include "AuctionHouseMgr.h"
 #include "Log.h"
 #include "Language.h"
-#include "Opcodes.h"
 #include "UpdateMask.h"
 #include "Util.h"
 #include "AccountMgr.h"
@@ -24,7 +24,6 @@
 #include "CreatureAI.h"
 #include "Vehicle.h"
 #include "Player.h"
-#include "Opcodes.h"

 void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData)
 {
@@ -22,7 +22,6 @@
 #include "GroupMgr.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Pet.h"
 #include "Player.h"
 #include "SocialMgr.h"
@@ -25,9 +25,7 @@
 #include "LootMgr.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
-#include "Opcodes.h"
 #include "Player.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"

@@ -28,7 +28,6 @@
 #include "ObjectMgr.h"
 #include "GuildMgr.h"
 #include "WorldSession.h"
-#include "LootMgr.h"
 #include "Chat.h"
 #include "zlib.h"
 #include "ObjectAccessor.h"
@@ -37,7 +36,6 @@
 #include "OutdoorPvP.h"
 #include "SocialMgr.h"
 #include "AccountMgr.h"
-#include "CreatureAI.h"
 #include "DBCEnums.h"
 #include "ScriptMgr.h"
 #include "MapManager.h"
@@ -20,7 +20,6 @@
 #include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
@@ -20,7 +20,6 @@
 #include "Log.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
@@ -18,7 +18,6 @@
 #include "WorldSession.h"
 #include "Player.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Log.h"

 void WorldSession::HandleGrantLevel(WorldPacket& recvData)
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "Pet.h"
 #include "WorldPacket.h"
@@ -24,7 +24,6 @@
 #include "Player.h"
 #include "TicketMgr.h"
 #include "Util.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"

@@ -22,7 +22,6 @@
 #include "World.h"
 #include "ObjectAccessor.h"
 #include "Log.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "Item.h"
 #include "Spell.h"
@@ -17,7 +17,6 @@

 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
 #include "Vehicle.h"
 #include "Player.h"
 #include "Log.h"
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Log.h"

 void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recvData)
 {
@@ -22,7 +22,6 @@
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Unit.h"
 #include "BattlegroundMgr.h"
 #include "Item.h"
 #include "AuctionHouseMgr.h"
@@ -16,12 +16,11 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include <mutex>
-#include <condition_variable>
-
 #include "MapUpdater.h"
 #include "Map.h"

+#include <mutex>
+

 class MapUpdateRequest
 {
@@ -17,10 +17,11 @@
 */

 #include "MoveSpline.h"
-#include <sstream>
 #include "Log.h"
 #include "Creature.h"

+#include <sstream>
+
 namespace Movement{

 Location MoveSpline::ComputePosition() const
@@ -22,7 +22,6 @@
 #include "Unit.h"
 #include "Transport.h"
 #include "WorldPacket.h"
-#include "Opcodes.h"

 namespace Movement
 {
@@ -18,11 +18,11 @@

 #include "CellImpl.h"
 #include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "GossipDef.h"
 #include "Map.h"
 #include "ObjectMgr.h"
 #include "Pet.h"
+#include "Item.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 #include "Transport.h"
@@ -39,10 +39,12 @@
 #include "BattlegroundMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "SocialMgr.h"
-#include "zlib.h"
 #include "ScriptMgr.h"
 #include "WardenWin.h"
 #include "MoveSpline.h"
+#include "WardenMac.h"
+
+#include <zlib.h>

 namespace {

@@ -19,10 +19,10 @@
 #include "WorldSocket.h"
 #include "BigNumber.h"
 #include "Opcodes.h"
-#include "Player.h"
 #include "ScriptMgr.h"
 #include "SHA1.h"
 #include "PacketLog.h"
+
 #include <memory>

 using boost::asio::ip::tcp;
@@ -21,6 +21,7 @@
 #include "ScriptMgr.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
+
 #include <boost/system/error_code.hpp>

 static void OnSocketAccept(tcp::socket&& sock)
@@ -25,15 +25,14 @@
 #include "Player.h"
 #include "Unit.h"
 #include "ObjectAccessor.h"
+#include "CellImpl.h"
 #include "Util.h"
 #include "Spell.h"
 #include "SpellHistory.h"
 #include "SpellAuraEffects.h"
 #include "Battleground.h"
 #include "OutdoorPvPMgr.h"
-#include "Formulas.h"
 #include "GridNotifiers.h"
-#include "CellImpl.h"
 #include "ScriptMgr.h"
 #include "Vehicle.h"
 #include "Battlefield.h"
@@ -15,10 +15,11 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include <string>
 #include "Spell.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellMgr.h"
+#include <string>

 bool _SpellScript::_Validate(SpellInfo const* entry)
 {
@@ -22,12 +22,13 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "ByteBuffer.h"
-#include <openssl/sha.h>
 #include "World.h"
 #include "Util.h"
 #include "Warden.h"
 #include "AccountMgr.h"

+#include <openssl/sha.h>
+
 Warden::Warden() : _session(NULL), _inputCrypto(16), _outputCrypto(16), _checkTimer(10000/*10 sec*/), _clientResponseTimer(0),
                   _dataSent(false), _previousTimestamp(0), _module(NULL), _initialized(false)
 {
@@ -23,13 +23,14 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "ByteBuffer.h"
-#include <openssl/md5.h>
 #include "World.h"
 #include "Player.h"
 #include "Util.h"
 #include "WardenMac.h"
 #include "WardenModuleMac.h"

+#include <openssl/md5.h>
+
 WardenMac::WardenMac() : Warden() { }

 WardenMac::~WardenMac() { }
@@ -24,7 +24,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "ByteBuffer.h"
-#include <openssl/md5.h>
 #include "Database/DatabaseEnv.h"
 #include "World.h"
 #include "Player.h"
@@ -32,6 +31,7 @@
 #include "WardenWin.h"
 #include "WardenModuleWin.h"
 #include "WardenCheckMgr.h"
+#include <openssl/md5.h>

 WardenWin::WardenWin() : Warden(), _serverTicks(0) {}

@@ -25,7 +25,6 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"

 namespace WeatherMgr