diff options
21 files changed, 32 insertions, 29 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp index 4bd6b3c701e..7bb44a97e86 100644 --- a/src/server/collision/BoundingIntervalHierarchy.cpp +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "BIH.h" +#include "BoundingIntervalHierarchy.h" void BIH::buildHierarchy(std::vector<uint32> &tempTree, buildData &dat, BuildStats &stats) { diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index 15ae90c23eb..2ee4e207c19 100644 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -19,11 +19,11 @@ #ifndef _BIH_H #define _BIH_H -#include <G3D/Vector3.h> -#include <G3D/Ray.h> -#include <G3D/AABox.h> +#include "Vector3.h" +#include "Ray.h" +#include "AABox.h" -#include <Platform/Define.h> +#include <Define.h> #include <stdexcept> #include <vector> diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index e9fa25d8674..b9d7d420d5d 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -23,7 +23,10 @@ SET(collision_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/dep/include/g3dlite + ${CMAKE_SOURCE_DIR}/externals/g3dlite + ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib + ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include + ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D ) add_library(collision STATIC ${collision_STAT_SRCS}) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 8c4ddd14f07..a10d576e309 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -5,7 +5,7 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "Item.h" #include "Spell.h" #include "ObjectMgr.h" diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 8b7aca888e1..217dd066310 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -9,7 +9,7 @@ SDComment: SDCategory: Npc EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedEscortAI.h" enum ePoints diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 4f1543dc778..b4a51f9eb27 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -9,7 +9,7 @@ SDComment: This AI is under development SDCategory: Npc EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedFollowerAI.h" const float MAX_PLAYER_DISTANCE = 100.0f; diff --git a/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp index 68dc8690470..4dd19547dda 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp @@ -21,7 +21,7 @@ SDComment: SDCategory: Guards EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedGuardAI.h" // **** This script is for use within every single guard to save coding time **** diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp index 08797515837..7d86c8e54a6 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp @@ -21,7 +21,7 @@ SDComment: Base Class for SimpleAI creatures SDCategory: Creatures EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedSimpleAI.h" SimpleAI::SimpleAI(Creature *c) : ScriptedAI(c) diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp b/src/server/game/PrecompiledHeaders/ScriptPCH.cpp index a80690d05da..41fecf3c60d 100644 --- a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp +++ b/src/server/game/PrecompiledHeaders/ScriptPCH.cpp @@ -2,5 +2,5 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 2dcfd258942..3c506f9a90f 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -2,8 +2,8 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedPch.h" -#include "Config/Config.h" +#include "ScriptPCH.h" +#include "Configuration/Config.h" #include "Database/DatabaseEnv.h" #include "DBCStores.h" #include "ObjectMgr.h" diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 0037b100412..9c25475aa41 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptSystem.h" #include "ProgressBar.h" #include "ObjectMgr.h" diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp index a9c8101d7b1..ee2efcaffb2 100644 --- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "zlib/zlib.h" +#include "zlib.h" #include "AddonHandler.h" #include "Database/DatabaseEnv.h" diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h index 999785339bc..956b6030171 100644 --- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h +++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h @@ -22,7 +22,7 @@ #define __ADDONHANDLER_H #include "Common.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Policies/Singleton.h" #include "WorldPacket.h" diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index 416827d73ea..e57a5295df5 100644 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -25,7 +25,7 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Auth/md5.h" +#include "MD5.h" #include "Database/DatabaseEnv.h" #include "Database/DatabaseImpl.h" diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index ea6f892c126..f1ec828447a 100644 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -30,12 +30,12 @@ #include "World.h" #include "ObjectMgr.h" #include "WorldSession.h" -#include "Auth/BigNumber.h" -#include "Auth/Sha1.h" +#include "BigNumber.h" +#include "SHA1.h" #include "UpdateData.h" #include "LootMgr.h" #include "Chat.h" -#include <zlib/zlib.h> +#include "zlib.h" #include "ObjectAccessor.h" #include "Object.h" #include "BattleGround.h" diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index 1148fe174fc..1b850434726 100644 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -28,7 +28,7 @@ #include "Vehicle.h" #include "SpellAuras.h" #include "MapManager.h" -#include "Transports.h" +#include "Transport.h" #include "BattleGround.h" #include "WaypointMovementGenerator.h" #include "InstanceSaveMgr.h" diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp index 7c6c4020336..6cccb27ae87 100644 --- a/src/server/game/Server/Protocol/WorldLog.cpp +++ b/src/server/game/Server/Protocol/WorldLog.cpp @@ -24,7 +24,7 @@ #include "WorldLog.h" #include "Policies/SingletonImp.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Log.h" #define CLASS_LOCK Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex> diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index bc737717840..97c54c1f37e 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -40,7 +40,7 @@ #include "OutdoorPvPMgr.h" #include "MapManager.h" #include "SocialMgr.h" -#include "zlib/zlib.h" +#include "zlib.h" #include "ScriptMgr.h" #include "LFGMgr.h" diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index c07b369d0b9..b792ad2faf1 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -39,8 +39,8 @@ #include "ByteBuffer.h" #include "Opcodes.h" #include "Database/DatabaseEnv.h" -#include "Auth/BigNumber.h" -#include "Auth/Sha1.h" +#include "BigNumber.h" +#include "SHA1.h" #include "WorldSession.h" #include "WorldSocketMgr.h" #include "Log.h" diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index c23d08e6f78..f7bb3949ee0 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -42,7 +42,7 @@ #include "Log.h" #include "Common.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Database/DatabaseEnv.h" #include "WorldSocket.h" diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 0b00621dc72..30cedf28b4d 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -24,7 +24,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "SystemConfig.h" #include "Log.h" #include "Opcodes.h" @@ -65,7 +65,7 @@ #include "Util.h" #include "Language.h" #include "CreatureGroups.h" -#include "Transports.h" +#include "Transport.h" #include "ProgressBar.h" #include "ScriptMgr.h" #include "AddonMgr.h" |