* Remove more relative paths from includes

--HG--
branch : trunk

src/server/game/Chat/Commands/Debugcmds.cpp

@@ -19,23 +19,23 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
 #include "Vehicle.h"
 #include "Player.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "Unit.h"
 #include "GossipDef.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
-#include "Grids/Cells/Cell.h"
-#include "Grids/Cells/CellImpl.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Cell.h"
+#include "CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
 #include "SpellMgr.h"
 #include "ScriptMgr.h"
 

src/server/game/Chat/Commands/Level0.cpp

@@ -19,17 +19,17 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "World.h"
 #include "Player.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
 #include "ObjectAccessor.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "AccountMgr.h"
 #include "SystemConfig.h"
 #include "revision.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 bool ChatHandler::HandleHelpCommand(const char* args)
 {

src/server/game/Chat/Commands/Level1.cpp

@@ -19,22 +19,22 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "AccountMgr.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
-#include "Miscellaneous/Language.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Language.h"
+#include "CellImpl.h"
 #include "InstanceSaveMgr.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 #ifdef _DEBUG_VMAPS
 #include "VMapFactory.h"

src/server/game/Chat/Commands/Level2.cpp

@@ -19,23 +19,23 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Item.h"
 #include "GameObject.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
 #include "MapManager.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "World.h"
 #include "GameEventMgr.h"
 #include "SpellMgr.h"
 #include "PoolHandler.h"
 #include "AccountMgr.h"
-#include "Movement/Waypoints/WaypointManager.h"
-#include "Utilities/Util.h"
+#include "WaypointManager.h"
+#include "Util.h"
 #include <cctype>
 #include <iostream>
 #include <fstream>

src/server/game/Chat/Commands/Level3.cpp

@@ -19,9 +19,9 @@
 */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "AuctionHouseMgr.h"
@@ -29,29 +29,29 @@
 #include "PlayerDump.h"
 #include "SpellMgr.h"
 #include "Player.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "GameObject.h"
 #include "Chat.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "Guild.h"
 #include "ObjectAccessor.h"
 #include "MapManager.h"
-#include "Miscellaneous/Language.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Language.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 #include "Weather.h"
 #include "PointMovementGenerator.h"
 #include "TargetedMovementGenerator.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
 #include "SystemConfig.h"
-#include "Configuration/ConfigEnv.h"
-#include "Utilities/Util.h"
+#include "ConfigEnv.h"
+#include "Util.h"
 #include "ItemEnchantmentMgr.h"
 #include "BattleGroundMgr.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceData.h"
-#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
+#include "AuctionHouseBot.h"
 #include "CreatureEventAIMgr.h"
 #include "SpellAuraEffects.h"
 #include "DBCEnums.h"

src/server/game/Combat/HostileRefManager.h

@@ -22,7 +22,7 @@
 #define _HOSTILEREFMANAGER
 
 #include "Common.h"
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 class Unit;
 class ThreatManager;

src/server/game/Conditions/ConditionMgr.cpp

@@ -19,13 +19,13 @@
  */
 
 
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Player.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
 #include "GameEventMgr.h"
 #include "ObjectMgr.h"
-#include "Utilities/ProgressBar.h"
+#include "ProgressBar.h"
 #include "InstanceData.h"
 #include "ConditionMgr.h"
 

src/server/game/DataStores/DBCStores.cpp

@@ -19,10 +19,10 @@
  */
 
 #include "DBCStores.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Logging/Log.h"
-#include "Utilities/ProgressBar.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "ProgressBar.h"
+#include "SharedDefines.h"
 #include "SpellMgr.h"
 
 #include "DBCfmt.h"

src/server/game/DataStores/DBCStructure.h

@@ -23,7 +23,7 @@
 
 #include "DBCEnums.h"
 #include "Define.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 #include <map>
 #include <set>

src/server/game/DungeonFinding/LFGMgr.cpp

@@ -15,14 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Group.h"
 #include "Player.h"
 #include "LFGMgr.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 INSTANTIATE_SINGLETON_1(LFGMgr);
 

src/server/game/DungeonFinding/LFGMgr.h

@@ -20,7 +20,7 @@
 #define _LFGMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Group.h"
 #include "LFG.h"
 

src/server/game/Entities/Corpse/Corpse.cpp

@@ -21,10 +21,10 @@
 #include "Common.h"
 #include "Corpse.h"
 #include "Player.h"
-#include "Entities/Object/Updates/UpdateMask.h"
+#include "UpdateMask.h"
 #include "ObjectAccessor.h"
-#include "Database/DatabaseEnv.h"
-#include "Server/Protocol/Opcodes.h"
+#include "DatabaseEnv.h"
+#include "Opcodes.h"
 #include "GossipDef.h"
 #include "World.h"
 

src/server/game/Entities/Creature/Creature.cpp

@@ -19,8 +19,8 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -29,27 +29,27 @@
 #include "GossipDef.h"
 #include "Player.h"
 #include "PoolHandler.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Logging/Log.h"
+#include "Opcodes.h"
+#include "Log.h"
 #include "LootMgr.h"
 #include "MapManager.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
-#include "Miscellaneous/Formulas.h"
+#include "Formulas.h"
 #include "WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "BattleGroundMgr.h"
-#include "Utilities/Util.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Util.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 #include "OutdoorPvPMgr.h"
 #include "GameEventMgr.h"
 #include "CreatureGroups.h"
 #include "Vehicle.h"
 #include "SpellAuraEffects.h"
 // apply implementation of the singletons
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
 {

src/server/game/Entities/Creature/CreatureGroups.cpp

@@ -21,8 +21,8 @@
 #include "Creature.h"
 #include "CreatureGroups.h"
 #include "ObjectMgr.h"
-#include "Utilities/ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "ProgressBar.h"
+#include "SingletonImp.h"
 #include "CreatureAI.h"
 
 #define MAX_DESYNC 5.0f

src/server/game/Entities/Creature/GossipDef.cpp

@@ -21,10 +21,10 @@
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
-#include "Miscellaneous/Formulas.h"
+#include "Opcodes.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "Formulas.h"
 
 GossipMenu::GossipMenu()
 {

src/server/game/Entities/Creature/TemporarySummon.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Logging/Log.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectMgr.h"

src/server/game/Entities/DynamicObject/DynamicObject.cpp

@@ -19,14 +19,14 @@
  */
 
 #include "Common.h"
-#include "Entities/Object/Updates/UpdateMask.h"
-#include "Server/Protocol/Opcodes.h"
+#include "UpdateMask.h"
+#include "Opcodes.h"
 #include "World.h"
 #include "ObjectAccessor.h"
-#include "Database/DatabaseEnv.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Cells/CellImpl.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "DatabaseEnv.h"
+#include "GridNotifiers.h"
+#include "CellImpl.h"
+#include "GridNotifiersImpl.h"
 
 DynamicObject::DynamicObject() : WorldObject()
 {

src/server/game/Entities/GameObject/GameObject.cpp

@@ -25,20 +25,20 @@
 #include "PoolHandler.h"
 #include "SpellMgr.h"
 #include "Spell.h"
-#include "Entities/Object/Updates/UpdateMask.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Packets/WorldPacket.h"
+#include "UpdateMask.h"
+#include "Opcodes.h"
+#include "WorldPacket.h"
 #include "World.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "LootMgr.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 #include "InstanceData.h"
 #include "BattleGround.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 #include "OutdoorPvPMgr.h"
-#include "BattleGrounds/Zones/BattleGroundAV.h"
+#include "BattleGroundAV.h"
 #include "ScriptMgr.h"
 
 GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue)