diff options
Diffstat (limited to 'src')
82 files changed, 278 insertions, 250 deletions
diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index f4da814e86b..19d5b5d8354 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -19,7 +19,7 @@ */ #include "GuardAI.h" -#include "Debugging/Errors.h" +#include "Errors.h" #include "Player.h" #include "ObjectAccessor.h" #include "World.h" diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h index 3d884e28906..73e3692a770 100644 --- a/src/server/game/AI/CoreAI/GuardAI.h +++ b/src/server/game/AI/CoreAI/GuardAI.h @@ -22,7 +22,7 @@ #define TRINITY_GUARDAI_H #include "CreatureAI.h" -#include "Utilities/Timer.h" +#include "Timer.h" class Creature; diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 72f0db20cb5..09ec8fae53f 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -19,7 +19,7 @@ */ #include "PetAI.h" -#include "Debugging/Errors.h" +#include "Errors.h" #include "Pet.h" #include "Player.h" #include "DBCStores.h" @@ -28,7 +28,7 @@ #include "SpellMgr.h" #include "Creature.h" #include "World.h" -#include "Utilities/Util.h" +#include "Util.h" int PetAI::Permissible(const Creature *creature) { diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index 52568999cd1..f6087a129ae 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -22,7 +22,7 @@ #define TRINITY_PETAI_H #include "CreatureAI.h" -#include "Utilities/Timer.h" +#include "Timer.h" class Creature; class Spell; diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp index f5e3739ccbf..fdca6314747 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -18,10 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Packets/ByteBuffer.h" +#include "ByteBuffer.h" #include "ReactorAI.h" -#include "Debugging/Errors.h" -#include "Logging/Log.h" +#include "Errors.h" +#include "Log.h" #include "ObjectAccessor.h" #include "CreatureAIImpl.h" diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 58045153efd..a6464f189e8 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -25,9 +25,9 @@ #include "ObjectAccessor.h" #include "SpellMgr.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" int TotemAI::Permissible(const Creature *creature) diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index 63459ace023..34f4dfa9945 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -22,7 +22,7 @@ #define TRINITY_TOTEMAI_H #include "CreatureAI.h" -#include "Utilities/Timer.h" +#include "Timer.h" class Creature; class Totem; diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 58020c785dd..c03d3dd09d0 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -21,7 +21,7 @@ #ifndef TRINITY_CREATUREAI_H #define TRINITY_CREATUREAI_H -#include "AI/CoreAI/UnitAI.h" +#include "UnitAI.h" #include "Common.h" class WorldObject; diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h index 6aa69eaaa29..bc3b9628010 100644 --- a/src/server/game/AI/CreatureAIFactory.h +++ b/src/server/game/AI/CreatureAIFactory.h @@ -21,8 +21,8 @@ #define TRINITY_CREATUREAIFACTORY_H //#include "Policies/Singleton.h" -#include "Dynamic/ObjectRegistry.h" -#include "Dynamic/FactoryHolder.h" +#include "ObjectRegistry.h" +#include "FactoryHolder.h" struct SelectableAI : public FactoryHolder<CreatureAI>, public Permissible<Creature> { diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp index 7b96e7a97d1..9db30a0a5c4 100644 --- a/src/server/game/AI/CreatureAIRegistry.cpp +++ b/src/server/game/AI/CreatureAIRegistry.cpp @@ -18,15 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "CoreAI/PassiveAI.h" -#include "CoreAI/ReactorAI.h" -#include "CoreAI/CombatAI.h" -#include "CoreAI/GuardAI.h" -#include "CoreAI/PetAI.h" -#include "CoreAI/TotemAI.h" -#include "EventAI/CreatureEventAI.h" -#include "Movement/MovementGenerators/RandomMovementGenerator.h" -#include "Movement/MovementGeneratorImpl.h" +#include "PassiveAI.h" +#include "ReactorAI.h" +#include "CombatAI.h" +#include "GuardAI.h" +#include "PetAI.h" +#include "TotemAI.h" +#include "CreatureEventAI.h" +#include "RandomMovementGenerator.h" +#include "MovementGeneratorImpl.h" #include "CreatureAIRegistry.h" #include "WaypointMovementGenerator.h" #include "CreatureAIFactory.h" diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index 6985edaaf2b..79977fab5b1 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -20,8 +20,8 @@ #include "Creature.h" #include "CreatureAISelector.h" -#include "AI/CoreAI/PassiveAI.h" -#include "Policies/SingletonImp.h" +#include "PassiveAI.h" +#include "SingletonImp.h" #include "MovementGenerator.h" #include "Pet.h" #include "TemporarySummon.h" diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 4162a002d99..47c8e9e6ad8 100644 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -24,11 +24,11 @@ #include "ObjectMgr.h" #include "Spell.h" #include "World.h" -#include "Grids/Cells/Cell.h" -#include "Grids/Cells/CellImpl.h" +#include "Cell.h" +#include "CellImpl.h" #include "GameEventMgr.h" -#include "Grids/Notifiers/GridNotifiers.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "InstanceData.h" #include "SpellMgr.h" #include "CreatureAIImpl.h" diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index f24226ee913..57c23c9a26b 100644 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -17,15 +17,15 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" +#include "DatabaseEnv.h" +#include "SQLStorage.h" #include "CreatureEventAI.h" #include "CreatureEventAIMgr.h" #include "ObjectMgr.h" -#include "Utilities/ProgressBar.h" -#include "Policies/SingletonImp.h" +#include "ProgressBar.h" +#include "SingletonImp.h" #include "ObjectDefines.h" -#include "Grids/GridDefines.h" +#include "GridDefines.h" #include "ConditionMgr.h" INSTANTIATE_SINGLETON_1(CreatureEventAIMgr); diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 8089b4d624d..18372677120 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -18,14 +18,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Database/DatabaseEnv.h" -#include "Policies/SingletonImp.h" +#include "DatabaseEnv.h" +#include "SingletonImp.h" #include "AccountMgr.h" #include "ObjectAccessor.h" #include "Player.h" -#include "Utilities/Util.h" -#include "Cryptography/SHA1.h" +#include "Util.h" +#include "SHA1.h" extern DatabaseType LoginDatabase; diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h index b017bf1836a..f770e24d902 100644 --- a/src/server/game/Accounts/AccountMgr.h +++ b/src/server/game/Accounts/AccountMgr.h @@ -24,7 +24,7 @@ #include <string> #include "Common.h" -#include "Policies/Singleton.h" +#include "Singleton.h" enum AccountOpResult { diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 9f449105005..e30f6ed35df 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -20,24 +20,24 @@ #include "DBCEnums.h" #include "ObjectMgr.h" #include "World.h" -#include "Packets/WorldPacket.h" -#include "Database/DatabaseEnv.h" -#include "Policies/SingletonImp.h" +#include "WorldPacket.h" +#include "DatabaseEnv.h" +#include "SingletonImp.h" #include "AchievementMgr.h" #include "ArenaTeam.h" -#include "Grids/Cells/CellImpl.h" -#include "Events/GameEventMgr.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" -#include "Guilds/Guild.h" -#include "Miscellaneous/Language.h" +#include "CellImpl.h" +#include "GameEventMgr.h" +#include "GridNotifiersImpl.h" +#include "Guild.h" +#include "Language.h" #include "Player.h" -#include "Utilities/ProgressBar.h" +#include "ProgressBar.h" #include "SpellMgr.h" #include "MapManager.h" #include "BattleGround.h" -#include "BattleGrounds/Zones/BattleGroundAB.h" +#include "BattleGroundAB.h" #include "Map.h" #include "InstanceData.h" diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index ea9e5e95142..6e27a3da068 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -22,8 +22,8 @@ #include <string> #include "Common.h" -#include "Policies/Singleton.h" -#include "Database/DatabaseEnv.h" +#include "Singleton.h" +#include "DatabaseEnv.h" #include "DBCEnums.h" #include "DBCStores.h" diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp index b87ddd023f7..b7b1d2e9333 100644 --- a/src/server/game/Addons/AddonMgr.cpp +++ b/src/server/game/Addons/AddonMgr.cpp @@ -18,15 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Database/DatabaseEnv.h" -#include "Policies/SingletonImp.h" +#include "DatabaseEnv.h" +#include "SingletonImp.h" #include "AddonMgr.h" #include "ObjectAccessor.h" #include "Player.h" -#include "Utilities/Util.h" -#include "Cryptography/SHA1.h" -#include "Utilities/ProgressBar.h" +#include "Util.h" +#include "SHA1.h" +#include "ProgressBar.h" extern DatabaseType LoginDatabase; diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h index 8f5eed4918f..0d648794416 100644 --- a/src/server/game/Addons/AddonMgr.h +++ b/src/server/game/Addons/AddonMgr.h @@ -22,7 +22,7 @@ #define _ADDONMGR_H #include "Common.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include <string> diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp index ebbf48e6476..e9cf8f21ab2 100644 --- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp @@ -3,7 +3,7 @@ #include "AuctionHouseBot.h" #include <vector> -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" INSTANTIATE_SINGLETON_1(AuctionHouseBot); using namespace std; diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h index 08e93fca232..f29a8762513 100644 --- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h +++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h @@ -2,7 +2,7 @@ #define AUCTION_HOUSE_BOT_H #include "World.h" -#include "Configuration/ConfigEnv.h" +#include "ConfigEnv.h" #include "ItemPrototype.h" #define AHB_GREY 0 diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 5f00d36ba45..744df2cb6e7 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -20,19 +20,19 @@ #include "ObjectMgr.h" #include "Player.h" #include "World.h" -#include "Packets/WorldPacket.h" -#include "Server/WorldSession.h" -#include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" -#include "Policies/SingletonImp.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include "DatabaseEnv.h" +#include "SQLStorage.h" +#include "SingletonImp.h" #include "DBCStores.h" #include "AccountMgr.h" #include "AuctionHouseMgr.h" #include "Item.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Logging/Log.h" -#include "Utilities/ProgressBar.h" +#include "ProgressBar.h" #include <vector> INSTANTIATE_SINGLETON_1(AuctionHouseMgr); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 2c29986f87a..7048e419c36 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -21,11 +21,11 @@ #ifndef _AUCTION_HOUSE_MGR_H #define _AUCTION_HOUSE_MGR_H -#include "Policies/Singleton.h" +#include "Singleton.h" -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" -#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h" +#include "AuctionHouseBot.h" class Item; class Player; diff --git a/src/server/game/BattleGrounds/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp index b5fe5c16dfe..4224ff6357a 100644 --- a/src/server/game/BattleGrounds/ArenaTeam.cpp +++ b/src/server/game/BattleGrounds/ArenaTeam.cpp @@ -17,7 +17,7 @@ */ #include "ObjectMgr.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" #include "ArenaTeam.h" #include "World.h" diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp index ed8ad8b62a8..591417c8fea 100644 --- a/src/server/game/BattleGrounds/BattleGround.cpp +++ b/src/server/game/BattleGrounds/BattleGround.cpp @@ -21,21 +21,21 @@ #include "Player.h" #include "ObjectMgr.h" #include "World.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" #include "ArenaTeam.h" #include "BattleGround.h" #include "BattleGroundMgr.h" #include "Creature.h" -#include "Miscellaneous/Formulas.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Formulas.h" +#include "GridNotifiersImpl.h" #include "Group.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "MapManager.h" #include "Object.h" #include "SpellAuras.h" #include "SpellAuraEffects.h" -#include "Utilities/Util.h" +#include "Util.h" namespace Trinity { diff --git a/src/server/game/BattleGrounds/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h index 36fdb18f1bc..6f46b6f8f6d 100644 --- a/src/server/game/BattleGrounds/BattleGround.h +++ b/src/server/game/BattleGrounds/BattleGround.h @@ -22,8 +22,8 @@ #define __BATTLEGROUND_H #include "Common.h" -#include "Miscellaneous/SharedDefines.h" -#include "DataStores/DBCEnums.h" +#include "SharedDefines.h" +#include "DBCEnums.h" class Creature; class GameObject; diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp index faf8b517f15..ea2d0c2f920 100644 --- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp +++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp @@ -21,33 +21,33 @@ #include "Common.h" #include "ObjectMgr.h" #include "World.h" -#include "Packets/WorldPacket.h" -#include "Policies/SingletonImp.h" +#include "WorldPacket.h" +#include "SingletonImp.h" #include "ArenaTeam.h" #include "BattleGroundMgr.h" -#include "Zones/BattleGroundAV.h" -#include "Zones/BattleGroundAB.h" -#include "Zones/BattleGroundEY.h" -#include "Zones/BattleGroundWS.h" -#include "Zones/BattleGroundNA.h" -#include "Zones/BattleGroundBE.h" -#include "Zones/BattleGroundAA.h" -#include "Zones/BattleGroundRL.h" -#include "Zones/BattleGroundSA.h" -#include "Zones/BattleGroundDS.h" -#include "Zones/BattleGroundRV.h" -#include "Zones/BattleGroundIC.h" -#include "Zones/BattleGroundRB.h" +#include "BattleGroundAV.h" +#include "BattleGroundAB.h" +#include "BattleGroundEY.h" +#include "BattleGroundWS.h" +#include "BattleGroundNA.h" +#include "BattleGroundBE.h" +#include "BattleGroundAA.h" +#include "BattleGroundRL.h" +#include "BattleGroundSA.h" +#include "BattleGroundDS.h" +#include "BattleGroundRV.h" +#include "BattleGroundIC.h" +#include "BattleGroundRB.h" #include "Chat.h" #include "Map.h" #include "MapInstanced.h" #include "MapManager.h" #include "Player.h" #include "GameEventMgr.h" -#include "Utilities/ProgressBar.h" -#include "Miscellaneous/SharedDefines.h" -#include "Miscellaneous/Formulas.h" +#include "ProgressBar.h" +#include "SharedDefines.h" +#include "Formulas.h" INSTANTIATE_SINGLETON_1(BattleGroundMgr); diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.h b/src/server/game/BattleGrounds/BattleGroundMgr.h index 569651a95b3..5319ce85752 100644 --- a/src/server/game/BattleGrounds/BattleGroundMgr.h +++ b/src/server/game/BattleGrounds/BattleGroundMgr.h @@ -22,7 +22,7 @@ #define __BATTLEGROUNDMGR_H #include "Common.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include "DBCEnums.h" #include "BattleGround.h" diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp index 9b2dd152c5e..56cf3ebed15 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp @@ -20,7 +20,7 @@ #include "BattleGround.h" #include "BattleGroundAA.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Player.h" BattleGroundAA::BattleGroundAA() diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp index 549b844cd20..38671e85597 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp @@ -19,16 +19,16 @@ */ #include "World.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" #include "ObjectMgr.h" #include "BattleGroundMgr.h" #include "BattleGround.h" #include "BattleGroundAB.h" #include "Creature.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Object.h" #include "Player.h" -#include "Utilities/Util.h" +#include "Util.h" // these variables aren't used outside of this file, so declare them only here uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp index 32334840f51..b477d6723fe 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp @@ -19,7 +19,7 @@ */ #include "ObjectMgr.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" #include "BattleGround.h" #include "BattleGroundAV.h" diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp index e5199115bcd..d6debe45ae3 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp @@ -20,11 +20,11 @@ #include "BattleGround.h" #include "BattleGroundBE.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" BattleGroundBE::BattleGroundBE() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp index 8a4ca9fb497..9036ef83f93 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp @@ -18,11 +18,11 @@ #include "BattleGround.h" #include "BattleGroundDS.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Player.h" #include "Object.h" #include "ObjectMgr.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" BattleGroundDS::BattleGroundDS() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp index a81a54f6b98..20f023e4c2a 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp @@ -20,15 +20,15 @@ #include "ObjectMgr.h" #include "World.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" #include "BattleGroundMgr.h" #include "BattleGround.h" #include "BattleGroundEY.h" #include "Creature.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Object.h" #include "Player.h" -#include "Utilities/Util.h" +#include "Util.h" // these variables aren't used outside of this file, so declare them only here uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h index d4bd89552be..4fe23c4c821 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h +++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h @@ -21,7 +21,7 @@ #ifndef __BATTLEGROUNDEY_H #define __BATTLEGROUNDEY_H -#include "Miscellaneous/Language.h" +#include "Language.h" class BattleGround; diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp index 8e759046f47..8dbcc81e5c6 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp @@ -19,7 +19,7 @@ #include "Player.h" #include "BattleGround.h" #include "BattleGroundIC.h" -#include "Miscellaneous/Language.h" +#include "Language.h" BattleGroundIC::BattleGroundIC() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp index 09f8fef44de..793cf13b3cb 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp @@ -20,11 +20,11 @@ #include "BattleGround.h" #include "BattleGroundNA.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" BattleGroundNA::BattleGroundNA() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp index 2777268a33c..cf22154ed11 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp @@ -21,7 +21,7 @@ #include "Player.h" #include "BattleGround.h" #include "BattleGroundRB.h" -#include "Miscellaneous/Language.h" +#include "Language.h" BattleGroundRB::BattleGroundRB() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp index 94374ace289..ef2ec3cfa94 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp @@ -20,11 +20,11 @@ #include "BattleGround.h" #include "BattleGroundRL.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" BattleGroundRL::BattleGroundRL() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp index 32e578ae5ed..fcc53dbbcf9 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp @@ -21,9 +21,9 @@ #include "BattleGround.h" #include "BattleGroundRV.h" #include "ObjectAccessor.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Player.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" #include "GameObject.h" BattleGroundRV::BattleGroundRV() diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp index f67ad9b3300..ccde43ce948 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp @@ -18,11 +18,11 @@ #include "BattleGround.h" #include "BattleGroundSA.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Player.h" #include "GameObject.h" #include "ObjectMgr.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" BattleGroundSA::BattleGroundSA() diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp index 2eb94ca9958..71872511274 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp @@ -22,13 +22,13 @@ #include "BattleGroundWS.h" #include "Creature.h" #include "GameObject.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "Object.h" #include "ObjectMgr.h" #include "BattleGroundMgr.h" #include "Player.h" #include "World.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" // these variables aren't used outside of this file, so declare them only here enum BG_WSG_Rewards diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 15d7da2b6d8..480f342aaa8 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -362,6 +362,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet @@ -393,6 +394,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Reputation ${CMAKE_SOURCE_DIR}/src/server/game/Scripting ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol + ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers ${CMAKE_SOURCE_DIR}/src/server/game/Server ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells @@ -406,8 +408,6 @@ include_directories( if(NOT DO_SCRIPTS) SET(game_STAT_SRCS ${game_STAT_SRCS} - PrecompiledHeaders/ScriptPCH.cpp - PrecompiledHeaders/ScriptPCH.h AI/ScriptedAI/ScriptedEscortAI.cpp AI/ScriptedAI/ScriptedEscortAI.h AI/ScriptedAI/ScriptedCreature.cpp diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index cafa814e1c9..d0b5923e30e 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -27,9 +27,9 @@ #include "Common.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "Player.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" enum ChatNotify { diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index f31d3ffde50..b26a42aa2b1 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -17,7 +17,7 @@ */ #include "ChannelMgr.h" -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "World.h" INSTANTIATE_SINGLETON_1(AllianceChannelMgr); diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index 6f3b7c415ae..1997eb76108 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -22,14 +22,11 @@ #include "Common.h" #include "Channel.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include <map> #include <string> -#include "Policies/Singleton.h" - -#include "Channel.h" #include "World.h" class ChannelMgr diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 66d867e4a69..10fec8fbe4f 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -21,19 +21,19 @@ #include "Common.h" #include "ObjectMgr.h" #include "World.h" -#include "Packets/WorldPacket.h" -#include "Server/WorldSession.h" -#include "Database/DatabaseEnv.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include "DatabaseEnv.h" #include "AccountMgr.h" -#include "Grids/Cells/CellImpl.h" +#include "CellImpl.h" #include "Chat.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" -#include "Miscellaneous/Language.h" -#include "Logging/Log.h" -#include "Server/Protocol/Opcodes.h" +#include "GridNotifiersImpl.h" +#include "Language.h" +#include "Log.h" +#include "Opcodes.h" #include "Player.h" -#include "Entities/Object/Updates/UpdateMask.h" +#include "UpdateMask.h" #include "SpellMgr.h" // Supported shift-links (client generated and server side) diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 8da2979ae82..a298ca03881 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -21,7 +21,7 @@ #ifndef TRINITYCORE_CHAT_H #define TRINITYCORE_CHAT_H -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" class ChatHandler; class WorldSession; diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index 517f4548121..f0ae370907b 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -22,9 +22,9 @@ #define _THREATMANAGER #include "Common.h" -#include "Miscellaneous/SharedDefines.h" -#include "Dynamic/LinkedReference/Reference.h" -#include "Combat/UnitEvents.h" +#include "SharedDefines.h" +#include "Reference.h" +#include "UnitEvents.h" #include <list> diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index f4404bce447..1bda56f38cc 100644 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -20,8 +20,8 @@ #define TRINITY_DBCSTORES_H #include "Common.h" -#include "DataStores/DBCStore.h" -#include "DataStores/DBCStructure.h" +#include "DBCStore.h" +#include "DBCStructure.h" #include <list> diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index 17c8e597d87..3ba00cec3b1 100644 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -22,8 +22,8 @@ #define TRINITYCORE_CORPSE_H #include "Object.h" -#include "Database/DatabaseEnv.h" -#include "Grids/GridDefines.h" +#include "DatabaseEnv.h" +#include "GridDefines.h" #include "LootMgr.h" enum CorpseType diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 0d4a4b0930e..c19187f2770 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -23,11 +23,11 @@ #include "Common.h" #include "Unit.h" -#include "Updates/UpdateMask.h" +#include "UpdateMask.h" #include "ItemPrototype.h" #include "LootMgr.h" -#include "Database/DatabaseEnv.h" -#include "Grids/Cells/Cell.h" +#include "DatabaseEnv.h" +#include "Cell.h" #include <list> diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h index 42ca4cc4ab3..ce2049cc23f 100644 --- a/src/server/game/Entities/Creature/GossipDef.h +++ b/src/server/game/Entities/Creature/GossipDef.h @@ -23,7 +23,7 @@ #include "Common.h" #include "QuestDef.h" -#include "Server/Protocol/Handlers/NPCHandler.h" +#include "NPCHandler.h" class WorldSession; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index be760e9bf41..db7f74cb412 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -22,10 +22,10 @@ #define TRINITYCORE_GAMEOBJECT_H #include "Common.h" -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" #include "Object.h" #include "LootMgr.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform #if defined(__GNUC__) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index edeac0a20ef..ad7d0c072ab 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -22,11 +22,11 @@ #define _OBJECT_H #include "Common.h" -#include "Updates/UpdateFields.h" -#include "Updates/UpdateData.h" -#include "Grids/GridReference.h" +#include "UpdateFields.h" +#include "UpdateData.h" +#include "GridReference.h" #include "ObjectDefines.h" -#include "Grids/GridDefines.h" +#include "GridDefines.h" #include "Map.h" #include <set> diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 983d10f5e02..3bff9808e9d 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -26,20 +26,20 @@ #include "Unit.h" #include "Item.h" -#include "Database/DatabaseEnv.h" -#include "Server/Protocol/Handlers/NPCHandler.h" -#include "Quests/QuestDef.h" -#include "Groups/Group.h" -#include "Item/Container/Bag.h" -#include "Server/WorldSession.h" +#include "DatabaseEnv.h" +#include "NPCHandler.h" +#include "QuestDef.h" +#include "Group.h" +#include "Bag.h" +#include "WorldSession.h" #include "Pet.h" #include "MapReference.h" -#include "Utilities/Util.h" // for Tokens typedef -#include "Achievements/AchievementMgr.h" -#include "Reputation/ReputationMgr.h" -#include "BattleGrounds/BattleGround.h" -#include "DataStores/DBCEnums.h" -#include "DungeonFinding/LFG.h" +#include "Util.h" // for Tokens typedef +#include "AchievementMgr.h" +#include "ReputationMgr.h" +#include "BattleGround.h" +#include "DBCEnums.h" +#include "LFG.h" #include<string> #include<vector> diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index dc90411d88b..7091ae22bd3 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -23,15 +23,15 @@ #include "Common.h" #include "Object.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "SpellAuraDefines.h" -#include "Updates/UpdateFields.h" -#include "Miscellaneous/SharedDefines.h" -#include "Combat/ThreatManager.h" -#include "Combat/HostileRefManager.h" -#include "Movement/FollowerReference.h" -#include "Movement/FollowerRefManager.h" -#include "Utilities/EventProcessor.h" +#include "UpdateFields.h" +#include "SharedDefines.h" +#include "ThreatManager.h" +#include "HostileRefManager.h" +#include "FollowerReference.h" +#include "FollowerRefManager.h" +#include "EventProcessor.h" #include "MotionMaster.h" #include "DBCStructure.h" #include <list> diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 2ad8fd3de59..d0e288fd77e 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -22,7 +22,7 @@ #define TRINITY_GAMEEVENT_MGR_H #include "Common.h" -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" #include "Define.h" #include "Policies/Singleton.h" diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 1f865229d42..e3295428505 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -22,14 +22,14 @@ #define TRINITY_OBJECTACCESSOR_H #include "Define.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include <ace/Thread_Mutex.h> -#include "Dynamic/UnorderedMap.h" -#include "Policies/ThreadingModel.h" +#include "UnorderedMap.h" +#include "ThreadingModel.h" -#include "Updates/UpdateData.h" +#include "UpdateData.h" -#include "Grids/GridDefines.h" +#include "GridDefines.h" #include "Object.h" #include "Player.h" diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index d8a0f81c698..79b6ffdd0eb 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -21,18 +21,18 @@ #ifndef _OBJECTMGR_H #define _OBJECTMGR_H -#include "Logging/Log.h" +#include "Log.h" #include "Object.h" -#include "Entities/Item/Container/Bag.h" +#include "Bag.h" #include "Creature.h" #include "Player.h" -#include "Entities/DynamicObject/DynamicObject.h" +#include "DynamicObject.h" #include "GameObject.h" -#include "Entities/Corpse/Corpse.h" +#include "Corpse.h" #include "QuestDef.h" -#include "Movement/Waypoints/Path.h" +#include "Path.h" #include "ItemPrototype.h" -#include "Server/Protocol/Handlers/NPCHandler.h" +#include "NPCHandler.h" #include "Database/DatabaseEnv.h" #include "Mail.h" #include "Map.h" diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index 657cc403e2a..4cc1e0864ba 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -26,7 +26,7 @@ #include "Dynamic/TypeContainer.h" #include "Dynamic/TypeContainerVisitor.h" -#include "Grids/GridDefines.h" +#include "GridDefines.h" class Map; class WorldObject; diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index e27ebec4a46..e59bb6aa8a0 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -22,7 +22,7 @@ #define TRINITY_GRIDDEFINES_H #include "Common.h" -#include "Grids/NGrid.h" +#include "NGrid.h" #include <cmath> // Forward class definitions diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 1d8967e4d9a..8c539519211 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -24,10 +24,10 @@ /** NGrid is nothing more than a wrapper of the Grid with an NxN cells */ -#include "Grids/Grid.h" -#include "Grids/GridReference.h" -#include "Utilities/Timer.h" -#include "Utilities/Util.h" +#include "Grid.h" +#include "GridReference.h" +#include "Timer.h" +#include "Util.h" #define DEFAULT_VISIBILITY_NOTIFY_PERIOD 1000 diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 9cbcb078128..b0abf0aae79 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -21,13 +21,13 @@ #ifndef TRINITY_GRIDNOTIFIERS_H #define TRINITY_GRIDNOTIFIERS_H -#include "Grids/ObjectGridLoader.h" -#include "Updates/UpdateData.h" +#include "ObjectGridLoader.h" +#include "UpdateData.h" #include <iostream> -#include "Entities/Corpse/Corpse.h" +#include "Corpse.h" #include "Object.h" -#include "Entities/DynamicObject/DynamicObject.h" +#include "DynamicObject.h" #include "GameObject.h" #include "Player.h" #include "Unit.h" diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 43cb94540c3..26a9c0bd328 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -22,10 +22,10 @@ #define TRINITY_GRIDNOTIFIERSIMPL_H #include "GridNotifiers.h" -#include "Packets/WorldPacket.h" -#include "Corpse/Corpse.h" +#include "WorldPacket.h" +#include "Corpse.h" #include "Player.h" -#include "Updates/UpdateData.h" +#include "UpdateData.h" #include "CreatureAI.h" #include "SpellAuras.h" diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index 90e3383fbc8..c1a59cb4ecb 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -21,11 +21,11 @@ #ifndef TRINITY_OBJECTGRIDLOADER_H #define TRINITY_OBJECTGRIDLOADER_H -#include "Dynamic/TypeList.h" +#include "TypeList.h" #include "Define.h" -#include "Grids/GridLoader.h" -#include "Grids/GridDefines.h" -#include "Grids/Cells/Cell.h" +#include "GridLoader.h" +#include "GridDefines.h" +#include "Cell.h" class ObjectWorldLoader; diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 55bb35eda6f..00fe2a97888 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -22,10 +22,10 @@ #define TRINITY_LOOTMGR_H #include "ItemEnchantmentMgr.h" -#include "Packets/ByteBuffer.h" -#include "Dynamic/LinkedReference/RefManager.h" -#include "Miscellaneous/SharedDefines.h" -#include "Conditions/ConditionMgr.h" +#include "ByteBuffer.h" +#include "RefManager.h" +#include "SharedDefines.h" +#include "ConditionMgr.h" #include <map> #include <vector> diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 5445401c487..52c79be7038 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -27,12 +27,12 @@ #include "ace/Thread_Mutex.h" #include "DBCStructure.h" -#include "Grids/GridDefines.h" -#include "Grids/Cells/Cell.h" -#include "Utilities/Timer.h" -#include "Miscellaneous/SharedDefines.h" -#include "Grids/GridRefManager.h" -#include "Maps/MapRefManager.h" +#include "GridDefines.h" +#include "Cell.h" +#include "Timer.h" +#include "SharedDefines.h" +#include "GridRefManager.h" +#include "MapRefManager.h" #include "MersenneTwister.h" #include <bitset> diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 5bd81cd965c..c4082ba086a 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -23,7 +23,7 @@ #include "Common.h" #include <vector> -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" #include "Object.h" class MovementGenerator; diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp index e588392689e..e3b0613cafd 100644 --- a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp +++ b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp @@ -1 +1 @@ -#include "pchdef.h"
\ No newline at end of file +#include "NixCorePCH.h" diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h index cd1ea4a418a..0757b07438d 100644 --- a/src/server/game/PrecompiledHeaders/WinCorePCH.h +++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h @@ -11,4 +11,4 @@ #include "SharedDefines.h" #include "ObjectMgr.h" -#include "ScriptedPch.h"
\ No newline at end of file +#include "ScriptPCH.h" diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 9fc0efdf850..4c0fd778a4d 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -20,10 +20,10 @@ #define __TRINITY_REPUTATION_MGR_H #include "Common.h" -#include "Miscellaneous/SharedDefines.h" -#include "Miscellaneous/Language.h" -#include "DataStores/DBCStructure.h" -#include "Database/QueryResult.h" +#include "SharedDefines.h" +#include "Language.h" +#include "DBCStructure.h" +#include "QueryResult.h" #include <map> static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] = diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 67f2026f1f5..4ae6931c3f5 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -31,7 +31,7 @@ // if this class definition not complite then VS for x64 release use different size for // struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from // table opcodeTable in source when Opcode.h included but WorldSession.h not included -#include "Server/WorldSession.h" +#include "WorldSession.h" /// List of Opcodes enum Opcodes diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index d2e8f6cdada..c17f3e3f3e6 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -26,10 +26,10 @@ #define __WORLDSESSION_H #include "Common.h" -#include "Miscellaneous/SharedDefines.h" -#include "Addons/AddonMgr.h" -#include "Database/QueryResult.h" -#include "World/World.h" +#include "SharedDefines.h" +#include "AddonMgr.h" +#include "QueryResult.h" +#include "World.h" struct ItemPrototype; struct AuctionEntry; diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index ef21e4a14b3..a987e35e65d 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -21,8 +21,8 @@ #ifndef __SPELL_H #define __SPELL_H -#include "Grids/GridDefines.h" -#include "Miscellaneous/SharedDefines.h" +#include "GridDefines.h" +#include "SharedDefines.h" class Unit; class Player; diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index b6768348417..ad0bad7cfaa 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -24,13 +24,13 @@ // For static or at-server-startup loaded spell data // For more high level function for sSpellStore data -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" #include "SpellAuraDefines.h" #include "DBCStructure.h" #include "DBCStores.h" -#include "Database/SQLStorage.h" +#include "SQLStorage.h" -#include "Dynamic/UnorderedMap.h" +#include "UnorderedMap.h" #include "Player.h" diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index dfd13e60d46..c53cab1124f 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -26,11 +26,11 @@ #define __WORLD_H #include "Common.h" -#include "Utilities/Timer.h" -#include "Policies/Singleton.h" -#include "Miscellaneous/SharedDefines.h" +#include "Timer.h" +#include "Singleton.h" +#include "SharedDefines.h" #include "ace/Atomic_Op.h" -#include "Database/QueryResult.h" +#include "QueryResult.h" #include <map> #include <set> diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 6e757b95243..3712904335d 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -582,48 +582,79 @@ message("-- Added Script Engine to SCRIPTS lib") include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/dep/include + ${CMAKE_SOURCE_DIR}/externals/mersennetwister + ${CMAKE_SOURCE_DIR}/externals/zlib + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography + ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores + ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/CountedReference + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic + ${CMAKE_SOURCE_DIR}/src/server/shared/Logging + ${CMAKE_SOURCE_DIR}/src/server/shared/Packets + ${CMAKE_SOURCE_DIR}/src/server/shared/Policies + ${CMAKE_SOURCE_DIR}/src/server/shared/Threading + ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities + ${CMAKE_SOURCE_DIR}/src/server/collision + ${CMAKE_SOURCE_DIR}/src/server/collision/Management ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/src/server/framework ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/game/Account ${CMAKE_SOURCE_DIR}/src/server/game/Achievements ${CMAKE_SOURCE_DIR}/src/server/game/Addons ${CMAKE_SOURCE_DIR}/src/server/game/AI + ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI + ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds ${CMAKE_SOURCE_DIR}/src/server/game/Calendar ${CMAKE_SOURCE_DIR}/src/server/game/Chat - ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr + ${CMAKE_SOURCE_DIR}/src/server/game/Conditions + ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/game/Combat ${CMAKE_SOURCE_DIR}/src/server/game/DataStores + ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle ${CMAKE_SOURCE_DIR}/src/server/game/Events ${CMAKE_SOURCE_DIR}/src/server/game/Globals + ${CMAKE_SOURCE_DIR}/src/server/game/Grids + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers ${CMAKE_SOURCE_DIR}/src/server/game/Groups ${CMAKE_SOURCE_DIR}/src/server/game/Guilds ${CMAKE_SOURCE_DIR}/src/server/game/Instances ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup ${CMAKE_SOURCE_DIR}/src/server/game/Loot ${CMAKE_SOURCE_DIR}/src/server/game/Mails - ${CMAKE_SOURCE_DIR}/src/server/game/Map - ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell - ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid + ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous + ${CMAKE_SOURCE_DIR}/src/server/game/Maps ${CMAKE_SOURCE_DIR}/src/server/game/Movement + ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP ${CMAKE_SOURCE_DIR}/src/server/game/Pools + ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders ${CMAKE_SOURCE_DIR}/src/server/game/Quests ${CMAKE_SOURCE_DIR}/src/server/game/Reputation - ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr + ${CMAKE_SOURCE_DIR}/src/server/game/Scripting + ${CMAKE_SOURCE_DIR}/src/server/game/Server + ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol + ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras diff --git a/src/server/scripts/Custom/on_events.cpp b/src/server/scripts/Custom/on_events.cpp index 94e54a07fba..904f0010d55 100644 --- a/src/server/scripts/Custom/on_events.cpp +++ b/src/server/scripts/Custom/on_events.cpp @@ -1,4 +1,4 @@ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include <cstring> //This function is called when the player logs in (every login) diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index a61fc21d5ba..e1788f0290b 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" enum Spells { diff --git a/src/server/shared/Dynamic/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h index d3cfe55ffc0..bdc06a572c9 100644 --- a/src/server/shared/Dynamic/CountedReference/Reference.h +++ b/src/server/shared/Dynamic/CountedReference/Reference.h @@ -33,8 +33,8 @@ */ #include <stdexcept> -#include "Platform/Define.h" -#include "Policies/ThreadingModel.h" +#include "Define.h" +#include "ThreadingModel.h" #include "ReferenceHolder.h" template diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h index 0fa61f5e562..4ed07431ee3 100644 --- a/src/server/shared/Dynamic/TypeContainer.h +++ b/src/server/shared/Dynamic/TypeContainer.h @@ -30,7 +30,7 @@ #include <vector> #include "Define.h" #include "Dynamic/TypeList.h" -#include "Grids/GridRefManager.h" +#include "GridRefManager.h" /* * @class ContainerMapList is a mulit-type container for map elements |