From 764b73b11c9a0b08e9f36fb80aa8c10b24e52e33 Mon Sep 17 00:00:00 2001 From: Mordred Admin Date: Mon, 18 Dec 2017 12:36:52 +0100 Subject: [PATCH] Moved and renamed Server_Common, now just src/common --- CMakeLists.txt | 8 +++---- .../Server_Common => common}/CMakeLists.txt | 6 ++++- .../Server_Common => common}/Common.h | 0 .../Server_Common => common}/CommonGen.cpp | 0 .../Server_Common => common}/CommonGen.h | 0 .../Config/XMLConfig.cpp | 0 .../Config/XMLConfig.h | 0 .../Server_Common => common}/Crypt/base64.cpp | 0 .../Server_Common => common}/Crypt/base64.h | 0 .../Crypt/blowfish.cpp | 0 .../Server_Common => common}/Crypt/blowfish.h | 0 .../Crypt/blowfish.h2 | 0 .../Server_Common => common}/Crypt/md5.cpp | 0 .../Server_Common => common}/Crypt/md5.h | 0 .../Database/CharaDbConnection.cpp | 0 .../Database/CharaDbConnection.h | 0 src/common/Database/DatabaseDef.h | 12 ++++++++++ .../Database/DbConnection.cpp | 0 .../Database/DbConnection.h | 3 +-- .../Database/DbLoader.cpp | 0 .../Database/DbLoader.h | 0 .../Database/DbWorker.cpp | 0 .../Database/DbWorker.h | 0 .../Database/DbWorkerPool.cpp | 0 .../Database/DbWorkerPool.h | 2 +- .../Database/Operation.h | 0 .../Database/PreparedStatement.cpp | 0 .../Database/PreparedStatement.h | 0 .../Database/StatementTask.cpp | 0 .../Database/StatementTask.h | 0 .../Server_Common => common}/Exd/ExdData.cpp | 0 .../Server_Common => common}/Exd/ExdData.h | 0 .../Server_Common => common}/Forwards.h | 0 .../Logging/Logger.cpp | 0 .../Server_Common => common}/Logging/Logger.h | 0 .../Network/Acceptor.cpp | 0 .../Network/Acceptor.h | 4 ++-- .../Network/CommonNetwork.h | 0 .../Network/Connection.cpp | 0 .../Network/Connection.h | 4 ++-- .../Network/GamePacket.cpp | 0 .../Network/GamePacket.h | 2 +- .../Network/GamePacketNew.h | 0 .../Network/GamePacketParser.cpp | 0 .../Network/GamePacketParser.h | 0 .../Server_Common => common}/Network/Hive.cpp | 0 .../Server_Common => common}/Network/Hive.h | 0 .../Network/PacketContainer.cpp | 0 .../Network/PacketContainer.h | 2 +- .../Network/PacketDef/Chat/ServerChatDef.h | 4 ++-- .../Network/PacketDef/Ipcs.h | 0 .../Network/PacketDef/Lobby/ServerLobbyDef.h | 6 ++--- .../Network/PacketDef/Zone/ServerZoneDef.h | 4 ++-- .../Util/LockedQueue.h | 0 .../Util/LockedWaitQueue.h | 0 .../Server_Common => common}/Util/Util.cpp | 0 .../Server_Common => common}/Util/Util.h | 0 .../Util/UtilMath.cpp | 0 .../Server_Common => common}/Util/UtilMath.h | 2 +- src/common/Version.cpp | 10 ++++++++ .../Server_Common => common}/Version.cpp.in | 0 .../Server_Common => common}/Version.h | 0 src/servers/CMakeLists.txt | 3 +-- .../Server_Common/Database/DatabaseDef.h | 12 ---------- src/servers/Server_Lobby/GameConnection.cpp | 20 ++++++++-------- src/servers/Server_Lobby/GameConnection.h | 17 +++++++------ .../Server_Lobby/LobbyPacketContainer.cpp | 6 ++--- .../Server_Lobby/LobbyPacketContainer.h | 4 ++-- src/servers/Server_Lobby/RestConnector.cpp | 4 ++-- src/servers/Server_Lobby/ServerLobby.cpp | 10 ++++---- src/servers/Server_Lobby/ServerLobby.h | 2 +- src/servers/Server_REST/PlayerMinimal.cpp | 8 +++---- src/servers/Server_REST/SapphireAPI.cpp | 4 ++-- src/servers/Server_REST/main.cpp | 23 +++++++++--------- src/servers/Server_Zone/Action/Action.cpp | 2 +- src/servers/Server_Zone/Action/Action.h | 5 ++-- src/servers/Server_Zone/Action/ActionCast.cpp | 10 ++++---- .../Server_Zone/Action/ActionCollision.cpp | 6 ++--- .../Server_Zone/Action/ActionCollision.h | 2 +- .../Server_Zone/Action/ActionMount.cpp | 10 ++++---- .../Server_Zone/Action/ActionTeleport.cpp | 6 ++--- .../Server_Zone/Action/EventAction.cpp | 10 ++++---- src/servers/Server_Zone/Action/EventAction.h | 2 +- .../Server_Zone/Action/EventItemAction.cpp | 6 ++--- src/servers/Server_Zone/Actor/Actor.cpp | 10 ++++---- src/servers/Server_Zone/Actor/Actor.h | 2 +- src/servers/Server_Zone/Actor/BattleNpc.cpp | 8 +++---- src/servers/Server_Zone/Actor/Player.cpp | 16 ++++++------- src/servers/Server_Zone/Actor/Player.h | 2 +- src/servers/Server_Zone/Actor/PlayerEvent.cpp | 10 ++++---- .../Server_Zone/Actor/PlayerInventory.cpp | 8 +++---- src/servers/Server_Zone/Actor/PlayerQuest.cpp | 10 ++++---- src/servers/Server_Zone/Actor/PlayerSql.cpp | 20 ++++++++-------- src/servers/Server_Zone/CMakeLists.txt | 4 ++-- .../Server_Zone/DebugCommand/DebugCommand.h | 2 +- .../DebugCommand/DebugCommandHandler.cpp | 18 +++++++------- .../DebugCommand/DebugCommandHandler.h | 2 +- src/servers/Server_Zone/Event/EventHelper.cpp | 4 ++-- .../Server_Zone/Inventory/Inventory.cpp | 10 ++++---- src/servers/Server_Zone/Inventory/Inventory.h | 2 +- src/servers/Server_Zone/Inventory/Item.cpp | 4 ++-- src/servers/Server_Zone/Inventory/Item.h | 2 +- .../Server_Zone/Inventory/ItemContainer.cpp | 6 ++--- .../Server_Zone/Inventory/ItemContainer.h | 2 +- src/servers/Server_Zone/Linkshell/Linkshell.h | 2 +- .../Server_Zone/Linkshell/LinkshellMgr.cpp | 4 ++-- src/servers/Server_Zone/Math/CalcBattle.cpp | 4 ++-- src/servers/Server_Zone/Math/CalcBattle.h | 2 +- src/servers/Server_Zone/Math/CalcStats.cpp | 4 ++-- src/servers/Server_Zone/Math/CalcStats.h | 2 +- .../Server_Zone/Network/GameConnection.cpp | 12 +++++----- .../Server_Zone/Network/GameConnection.h | 10 ++++---- .../Network/Handlers/ActionHandler.cpp | 12 +++++----- .../Network/Handlers/CFHandlers.cpp | 10 ++++---- .../Network/Handlers/EventHandlers.cpp | 10 ++++---- .../Network/Handlers/GMCommandHandlers.cpp | 12 +++++----- .../Network/Handlers/InventoryHandler.cpp | 12 +++++----- .../Network/Handlers/PacketHandlers.cpp | 16 ++++++------- .../Network/Handlers/SkillHandler.cpp | 12 +++++----- .../PacketWrappers/ActorControlPacket142.h | 6 ++--- .../PacketWrappers/ActorControlPacket143.h | 6 ++--- .../PacketWrappers/ActorControlPacket144.h | 6 ++--- .../Network/PacketWrappers/ChatPacket.h | 4 ++-- .../PacketWrappers/EventFinishPacket.h | 4 ++-- .../Network/PacketWrappers/EventPlayPacket.h | 4 ++-- .../Network/PacketWrappers/EventStartPacket.h | 4 ++-- .../Network/PacketWrappers/InitUIPacket.h | 4 ++-- .../Network/PacketWrappers/ModelEquipPacket.h | 2 +- .../Network/PacketWrappers/MoveActorPacket.h | 6 ++--- .../Network/PacketWrappers/PingPacket.h | 2 +- .../PacketWrappers/PlayerSpawnPacket.h | 6 ++--- .../PacketWrappers/PlayerStateFlagsPacket.h | 2 +- .../PacketWrappers/QuestMessagePacket.h | 4 ++-- .../PacketWrappers/ServerNoticePacket.h | 6 ++--- .../PacketWrappers/UpdateHpMpTpPacket.h | 4 ++-- .../Server_Zone/Script/NativeScriptManager.h | 4 ++-- .../Server_Zone/Script/ScriptLoader.cpp | 6 ++--- .../Server_Zone/Script/ScriptManager.cpp | 6 ++--- .../Server_Zone/Script/ScriptManager.h | 2 +- src/servers/Server_Zone/ServerZone.cpp | 24 +++++++++---------- src/servers/Server_Zone/ServerZone.h | 2 +- src/servers/Server_Zone/Session.cpp | 4 ++-- .../Server_Zone/StatusEffect/StatusEffect.cpp | 10 ++++---- src/servers/Server_Zone/Zone/Zone.cpp | 20 ++++++++-------- src/servers/Server_Zone/Zone/Zone.h | 2 +- src/servers/Server_Zone/Zone/ZoneMgr.cpp | 6 ++--- src/servers/Server_Zone/Zone/ZonePosition.h | 2 +- src/tools/exd_common_gen/main.cpp | 4 ++-- src/tools/exd_struct_gen/main.cpp | 4 ++-- src/tools/exd_struct_test/main.cpp | 2 +- src/tools/quest_parser/main.cpp | 4 ++-- 151 files changed, 345 insertions(+), 334 deletions(-) rename src/{servers/Server_Common => common}/CMakeLists.txt (88%) rename src/{servers/Server_Common => common}/Common.h (100%) rename src/{servers/Server_Common => common}/CommonGen.cpp (100%) rename src/{servers/Server_Common => common}/CommonGen.h (100%) rename src/{servers/Server_Common => common}/Config/XMLConfig.cpp (100%) rename src/{servers/Server_Common => common}/Config/XMLConfig.h (100%) rename src/{servers/Server_Common => common}/Crypt/base64.cpp (100%) rename src/{servers/Server_Common => common}/Crypt/base64.h (100%) rename src/{servers/Server_Common => common}/Crypt/blowfish.cpp (100%) rename src/{servers/Server_Common => common}/Crypt/blowfish.h (100%) rename src/{servers/Server_Common => common}/Crypt/blowfish.h2 (100%) rename src/{servers/Server_Common => common}/Crypt/md5.cpp (100%) rename src/{servers/Server_Common => common}/Crypt/md5.h (100%) rename src/{servers/Server_Common => common}/Database/CharaDbConnection.cpp (100%) rename src/{servers/Server_Common => common}/Database/CharaDbConnection.h (100%) create mode 100644 src/common/Database/DatabaseDef.h rename src/{servers/Server_Common => common}/Database/DbConnection.cpp (100%) rename src/{servers/Server_Common => common}/Database/DbConnection.h (96%) rename src/{servers/Server_Common => common}/Database/DbLoader.cpp (100%) rename src/{servers/Server_Common => common}/Database/DbLoader.h (100%) rename src/{servers/Server_Common => common}/Database/DbWorker.cpp (100%) rename src/{servers/Server_Common => common}/Database/DbWorker.h (100%) rename src/{servers/Server_Common => common}/Database/DbWorkerPool.cpp (100%) rename src/{servers/Server_Common => common}/Database/DbWorkerPool.h (97%) rename src/{servers/Server_Common => common}/Database/Operation.h (100%) rename src/{servers/Server_Common => common}/Database/PreparedStatement.cpp (100%) rename src/{servers/Server_Common => common}/Database/PreparedStatement.h (100%) rename src/{servers/Server_Common => common}/Database/StatementTask.cpp (100%) rename src/{servers/Server_Common => common}/Database/StatementTask.h (100%) rename src/{servers/Server_Common => common}/Exd/ExdData.cpp (100%) rename src/{servers/Server_Common => common}/Exd/ExdData.h (100%) rename src/{servers/Server_Common => common}/Forwards.h (100%) rename src/{servers/Server_Common => common}/Logging/Logger.cpp (100%) rename src/{servers/Server_Common => common}/Logging/Logger.h (100%) rename src/{servers/Server_Common => common}/Network/Acceptor.cpp (100%) rename src/{servers/Server_Common => common}/Network/Acceptor.h (97%) rename src/{servers/Server_Common => common}/Network/CommonNetwork.h (100%) rename src/{servers/Server_Common => common}/Network/Connection.cpp (100%) rename src/{servers/Server_Common => common}/Network/Connection.h (98%) rename src/{servers/Server_Common => common}/Network/GamePacket.cpp (100%) rename src/{servers/Server_Common => common}/Network/GamePacket.h (97%) rename src/{servers/Server_Common => common}/Network/GamePacketNew.h (100%) rename src/{servers/Server_Common => common}/Network/GamePacketParser.cpp (100%) rename src/{servers/Server_Common => common}/Network/GamePacketParser.h (100%) rename src/{servers/Server_Common => common}/Network/Hive.cpp (100%) rename src/{servers/Server_Common => common}/Network/Hive.h (100%) rename src/{servers/Server_Common => common}/Network/PacketContainer.cpp (100%) rename src/{servers/Server_Common => common}/Network/PacketContainer.h (91%) rename src/{servers/Server_Common => common}/Network/PacketDef/Chat/ServerChatDef.h (88%) rename src/{servers/Server_Common => common}/Network/PacketDef/Ipcs.h (100%) rename src/{servers/Server_Common => common}/Network/PacketDef/Lobby/ServerLobbyDef.h (96%) rename src/{servers/Server_Common => common}/Network/PacketDef/Zone/ServerZoneDef.h (99%) rename src/{servers/Server_Common => common}/Util/LockedQueue.h (100%) rename src/{servers/Server_Common => common}/Util/LockedWaitQueue.h (100%) rename src/{servers/Server_Common => common}/Util/Util.cpp (100%) rename src/{servers/Server_Common => common}/Util/Util.h (100%) rename src/{servers/Server_Common => common}/Util/UtilMath.cpp (100%) rename src/{servers/Server_Common => common}/Util/UtilMath.h (94%) create mode 100644 src/common/Version.cpp rename src/{servers/Server_Common => common}/Version.cpp.in (100%) rename src/{servers/Server_Common => common}/Version.h (100%) delete mode 100644 src/servers/Server_Common/Database/DatabaseDef.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 54f7d380..00810894 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0) ########################################################################## # Common and library path -set(SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common") +set(SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/common") set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries") ########################################################################## @@ -38,8 +38,8 @@ include( "cmake/compiler.cmake" ) include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) git_describe(VERSION --tags --dirty=-d) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common/Version.cpp.in" - "${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common/Version.cpp" @ONLY) +configure_file("${SERVER_COMMON_DIR}/Version.cpp.in" + "${SERVER_COMMON_DIR}/Version.cpp" @ONLY) ########################################################################## # Common include folders @@ -65,6 +65,6 @@ add_subdirectory("src/tools/exd_common_gen") add_subdirectory("src/tools/exd_struct_gen") add_subdirectory("src/tools/exd_struct_test") add_subdirectory("src/tools/quest_parser") -add_subdirectory("src/tools/pcb_reader") +#add_subdirectory("src/tools/pcb_reader") add_subdirectory("scripts/native") diff --git a/src/servers/Server_Common/CMakeLists.txt b/src/common/CMakeLists.txt similarity index 88% rename from src/servers/Server_Common/CMakeLists.txt rename to src/common/CMakeLists.txt index b84654fb..e9ed195c 100644 --- a/src/servers/Server_Common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 2.6) project(Sapphire) -file(GLOB UTILS_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +file(GLOB UTILS_PUBLIC_INCLUDE_FILES + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/*.h") file(GLOB UTILS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp" diff --git a/src/servers/Server_Common/Common.h b/src/common/Common.h similarity index 100% rename from src/servers/Server_Common/Common.h rename to src/common/Common.h diff --git a/src/servers/Server_Common/CommonGen.cpp b/src/common/CommonGen.cpp similarity index 100% rename from src/servers/Server_Common/CommonGen.cpp rename to src/common/CommonGen.cpp diff --git a/src/servers/Server_Common/CommonGen.h b/src/common/CommonGen.h similarity index 100% rename from src/servers/Server_Common/CommonGen.h rename to src/common/CommonGen.h diff --git a/src/servers/Server_Common/Config/XMLConfig.cpp b/src/common/Config/XMLConfig.cpp similarity index 100% rename from src/servers/Server_Common/Config/XMLConfig.cpp rename to src/common/Config/XMLConfig.cpp diff --git a/src/servers/Server_Common/Config/XMLConfig.h b/src/common/Config/XMLConfig.h similarity index 100% rename from src/servers/Server_Common/Config/XMLConfig.h rename to src/common/Config/XMLConfig.h diff --git a/src/servers/Server_Common/Crypt/base64.cpp b/src/common/Crypt/base64.cpp similarity index 100% rename from src/servers/Server_Common/Crypt/base64.cpp rename to src/common/Crypt/base64.cpp diff --git a/src/servers/Server_Common/Crypt/base64.h b/src/common/Crypt/base64.h similarity index 100% rename from src/servers/Server_Common/Crypt/base64.h rename to src/common/Crypt/base64.h diff --git a/src/servers/Server_Common/Crypt/blowfish.cpp b/src/common/Crypt/blowfish.cpp similarity index 100% rename from src/servers/Server_Common/Crypt/blowfish.cpp rename to src/common/Crypt/blowfish.cpp diff --git a/src/servers/Server_Common/Crypt/blowfish.h b/src/common/Crypt/blowfish.h similarity index 100% rename from src/servers/Server_Common/Crypt/blowfish.h rename to src/common/Crypt/blowfish.h diff --git a/src/servers/Server_Common/Crypt/blowfish.h2 b/src/common/Crypt/blowfish.h2 similarity index 100% rename from src/servers/Server_Common/Crypt/blowfish.h2 rename to src/common/Crypt/blowfish.h2 diff --git a/src/servers/Server_Common/Crypt/md5.cpp b/src/common/Crypt/md5.cpp similarity index 100% rename from src/servers/Server_Common/Crypt/md5.cpp rename to src/common/Crypt/md5.cpp diff --git a/src/servers/Server_Common/Crypt/md5.h b/src/common/Crypt/md5.h similarity index 100% rename from src/servers/Server_Common/Crypt/md5.h rename to src/common/Crypt/md5.h diff --git a/src/servers/Server_Common/Database/CharaDbConnection.cpp b/src/common/Database/CharaDbConnection.cpp similarity index 100% rename from src/servers/Server_Common/Database/CharaDbConnection.cpp rename to src/common/Database/CharaDbConnection.cpp diff --git a/src/servers/Server_Common/Database/CharaDbConnection.h b/src/common/Database/CharaDbConnection.h similarity index 100% rename from src/servers/Server_Common/Database/CharaDbConnection.h rename to src/common/Database/CharaDbConnection.h diff --git a/src/common/Database/DatabaseDef.h b/src/common/Database/DatabaseDef.h new file mode 100644 index 00000000..8fc3f2d9 --- /dev/null +++ b/src/common/Database/DatabaseDef.h @@ -0,0 +1,12 @@ +#ifndef _DATABASEDEF_H +#define _DATABASEDEF_H + +#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include +#include +#include +#include + +extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; + +#endif diff --git a/src/servers/Server_Common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp similarity index 100% rename from src/servers/Server_Common/Database/DbConnection.cpp rename to src/common/Database/DbConnection.cpp diff --git a/src/servers/Server_Common/Database/DbConnection.h b/src/common/Database/DbConnection.h similarity index 96% rename from src/servers/Server_Common/Database/DbConnection.h rename to src/common/Database/DbConnection.h index 237ed9f3..ddb66e17 100644 --- a/src/servers/Server_Common/Database/DbConnection.h +++ b/src/common/Database/DbConnection.h @@ -6,8 +6,7 @@ #include #include #include -#include "src/servers/Server_Common/Util/LockedWaitQueue.h" -#include +#include #include #include diff --git a/src/servers/Server_Common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp similarity index 100% rename from src/servers/Server_Common/Database/DbLoader.cpp rename to src/common/Database/DbLoader.cpp diff --git a/src/servers/Server_Common/Database/DbLoader.h b/src/common/Database/DbLoader.h similarity index 100% rename from src/servers/Server_Common/Database/DbLoader.h rename to src/common/Database/DbLoader.h diff --git a/src/servers/Server_Common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp similarity index 100% rename from src/servers/Server_Common/Database/DbWorker.cpp rename to src/common/Database/DbWorker.cpp diff --git a/src/servers/Server_Common/Database/DbWorker.h b/src/common/Database/DbWorker.h similarity index 100% rename from src/servers/Server_Common/Database/DbWorker.h rename to src/common/Database/DbWorker.h diff --git a/src/servers/Server_Common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp similarity index 100% rename from src/servers/Server_Common/Database/DbWorkerPool.cpp rename to src/common/Database/DbWorkerPool.cpp diff --git a/src/servers/Server_Common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h similarity index 97% rename from src/servers/Server_Common/Database/DbWorkerPool.h rename to src/common/Database/DbWorkerPool.h index 6b364171..a16a5b28 100644 --- a/src/servers/Server_Common/Database/DbWorkerPool.h +++ b/src/common/Database/DbWorkerPool.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "DbConnection.h" namespace Core { diff --git a/src/servers/Server_Common/Database/Operation.h b/src/common/Database/Operation.h similarity index 100% rename from src/servers/Server_Common/Database/Operation.h rename to src/common/Database/Operation.h diff --git a/src/servers/Server_Common/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp similarity index 100% rename from src/servers/Server_Common/Database/PreparedStatement.cpp rename to src/common/Database/PreparedStatement.cpp diff --git a/src/servers/Server_Common/Database/PreparedStatement.h b/src/common/Database/PreparedStatement.h similarity index 100% rename from src/servers/Server_Common/Database/PreparedStatement.h rename to src/common/Database/PreparedStatement.h diff --git a/src/servers/Server_Common/Database/StatementTask.cpp b/src/common/Database/StatementTask.cpp similarity index 100% rename from src/servers/Server_Common/Database/StatementTask.cpp rename to src/common/Database/StatementTask.cpp diff --git a/src/servers/Server_Common/Database/StatementTask.h b/src/common/Database/StatementTask.h similarity index 100% rename from src/servers/Server_Common/Database/StatementTask.h rename to src/common/Database/StatementTask.h diff --git a/src/servers/Server_Common/Exd/ExdData.cpp b/src/common/Exd/ExdData.cpp similarity index 100% rename from src/servers/Server_Common/Exd/ExdData.cpp rename to src/common/Exd/ExdData.cpp diff --git a/src/servers/Server_Common/Exd/ExdData.h b/src/common/Exd/ExdData.h similarity index 100% rename from src/servers/Server_Common/Exd/ExdData.h rename to src/common/Exd/ExdData.h diff --git a/src/servers/Server_Common/Forwards.h b/src/common/Forwards.h similarity index 100% rename from src/servers/Server_Common/Forwards.h rename to src/common/Forwards.h diff --git a/src/servers/Server_Common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp similarity index 100% rename from src/servers/Server_Common/Logging/Logger.cpp rename to src/common/Logging/Logger.cpp diff --git a/src/servers/Server_Common/Logging/Logger.h b/src/common/Logging/Logger.h similarity index 100% rename from src/servers/Server_Common/Logging/Logger.h rename to src/common/Logging/Logger.h diff --git a/src/servers/Server_Common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp similarity index 100% rename from src/servers/Server_Common/Network/Acceptor.cpp rename to src/common/Network/Acceptor.cpp diff --git a/src/servers/Server_Common/Network/Acceptor.h b/src/common/Network/Acceptor.h similarity index 97% rename from src/servers/Server_Common/Network/Acceptor.h rename to src/common/Network/Acceptor.h index e7b69880..191184e8 100644 --- a/src/servers/Server_Common/Network/Acceptor.h +++ b/src/common/Network/Acceptor.h @@ -5,7 +5,7 @@ #include #include #include -#include "src/servers/Server_Common/Forwards.h" +#include namespace Core { @@ -75,4 +75,4 @@ namespace Core } } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Common/Network/CommonNetwork.h b/src/common/Network/CommonNetwork.h similarity index 100% rename from src/servers/Server_Common/Network/CommonNetwork.h rename to src/common/Network/CommonNetwork.h diff --git a/src/servers/Server_Common/Network/Connection.cpp b/src/common/Network/Connection.cpp similarity index 100% rename from src/servers/Server_Common/Network/Connection.cpp rename to src/common/Network/Connection.cpp diff --git a/src/servers/Server_Common/Network/Connection.h b/src/common/Network/Connection.h similarity index 98% rename from src/servers/Server_Common/Network/Connection.h rename to src/common/Network/Connection.h index 194aea5a..40dd66fe 100644 --- a/src/servers/Server_Common/Network/Connection.h +++ b/src/common/Network/Connection.h @@ -9,7 +9,7 @@ #include #include -#include "src/servers/Server_Common/Forwards.h" +#include #include "Acceptor.h" @@ -141,4 +141,4 @@ namespace Core { } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Common/Network/GamePacket.cpp b/src/common/Network/GamePacket.cpp similarity index 100% rename from src/servers/Server_Common/Network/GamePacket.cpp rename to src/common/Network/GamePacket.cpp diff --git a/src/servers/Server_Common/Network/GamePacket.h b/src/common/Network/GamePacket.h similarity index 97% rename from src/servers/Server_Common/Network/GamePacket.h rename to src/common/Network/GamePacket.h index 6fcc584e..08e7b992 100644 --- a/src/servers/Server_Common/Network/GamePacket.h +++ b/src/common/Network/GamePacket.h @@ -2,7 +2,7 @@ #define _GAMEPACKET_H_ #include "CommonNetwork.h" -#include "src/servers/Server_Common/Forwards.h" +#include #include #include diff --git a/src/servers/Server_Common/Network/GamePacketNew.h b/src/common/Network/GamePacketNew.h similarity index 100% rename from src/servers/Server_Common/Network/GamePacketNew.h rename to src/common/Network/GamePacketNew.h diff --git a/src/servers/Server_Common/Network/GamePacketParser.cpp b/src/common/Network/GamePacketParser.cpp similarity index 100% rename from src/servers/Server_Common/Network/GamePacketParser.cpp rename to src/common/Network/GamePacketParser.cpp diff --git a/src/servers/Server_Common/Network/GamePacketParser.h b/src/common/Network/GamePacketParser.h similarity index 100% rename from src/servers/Server_Common/Network/GamePacketParser.h rename to src/common/Network/GamePacketParser.h diff --git a/src/servers/Server_Common/Network/Hive.cpp b/src/common/Network/Hive.cpp similarity index 100% rename from src/servers/Server_Common/Network/Hive.cpp rename to src/common/Network/Hive.cpp diff --git a/src/servers/Server_Common/Network/Hive.h b/src/common/Network/Hive.h similarity index 100% rename from src/servers/Server_Common/Network/Hive.h rename to src/common/Network/Hive.h diff --git a/src/servers/Server_Common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp similarity index 100% rename from src/servers/Server_Common/Network/PacketContainer.cpp rename to src/common/Network/PacketContainer.cpp diff --git a/src/servers/Server_Common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h similarity index 91% rename from src/servers/Server_Common/Network/PacketContainer.h rename to src/common/Network/PacketContainer.h index 8bab92a4..9f39de72 100644 --- a/src/servers/Server_Common/Network/PacketContainer.h +++ b/src/common/Network/PacketContainer.h @@ -3,7 +3,7 @@ #include -#include "src/servers/Server_Common/Common.h" +#include #include "CommonNetwork.h" #include "GamePacket.h" diff --git a/src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h similarity index 88% rename from src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h rename to src/common/Network/PacketDef/Chat/ServerChatDef.h index 219b3706..843cf289 100644 --- a/src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h +++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h @@ -1,8 +1,8 @@ #ifndef _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H #define _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H -#include "src/servers/Server_Common/Common.h" -#include "src/servers/Server_Common/Network/CommonNetwork.h" +#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h similarity index 100% rename from src/servers/Server_Common/Network/PacketDef/Ipcs.h rename to src/common/Network/PacketDef/Ipcs.h diff --git a/src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h similarity index 96% rename from src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h rename to src/common/Network/PacketDef/Lobby/ServerLobbyDef.h index 2d0fe4d0..cf971bef 100644 --- a/src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h +++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h @@ -1,8 +1,8 @@ #ifndef _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H #define _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H -#include "src/servers/Server_Common/Common.h" -#include "src/servers/Server_Common/Network/CommonNetwork.h" +#include +#include namespace Core { namespace Network { @@ -140,4 +140,4 @@ struct FFXIVIpcLobbyError : FFXIVIpcBasePacket } } } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h similarity index 99% rename from src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h rename to src/common/Network/PacketDef/Zone/ServerZoneDef.h index c0b76d10..53a5c50d 100644 --- a/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -7,8 +7,8 @@ #ifndef _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H #define _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H -#include "src/servers/Server_Common/Common.h" -#include "src/servers/Server_Common/Network/CommonNetwork.h" +#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Common/Util/LockedQueue.h b/src/common/Util/LockedQueue.h similarity index 100% rename from src/servers/Server_Common/Util/LockedQueue.h rename to src/common/Util/LockedQueue.h diff --git a/src/servers/Server_Common/Util/LockedWaitQueue.h b/src/common/Util/LockedWaitQueue.h similarity index 100% rename from src/servers/Server_Common/Util/LockedWaitQueue.h rename to src/common/Util/LockedWaitQueue.h diff --git a/src/servers/Server_Common/Util/Util.cpp b/src/common/Util/Util.cpp similarity index 100% rename from src/servers/Server_Common/Util/Util.cpp rename to src/common/Util/Util.cpp diff --git a/src/servers/Server_Common/Util/Util.h b/src/common/Util/Util.h similarity index 100% rename from src/servers/Server_Common/Util/Util.h rename to src/common/Util/Util.h diff --git a/src/servers/Server_Common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp similarity index 100% rename from src/servers/Server_Common/Util/UtilMath.cpp rename to src/common/Util/UtilMath.cpp diff --git a/src/servers/Server_Common/Util/UtilMath.h b/src/common/Util/UtilMath.h similarity index 94% rename from src/servers/Server_Common/Util/UtilMath.h rename to src/common/Util/UtilMath.h index 7c37ed42..65e18e37 100644 --- a/src/servers/Server_Common/Util/UtilMath.h +++ b/src/common/Util/UtilMath.h @@ -1,7 +1,7 @@ #ifndef _UTILMATH_H #define _UTILMATH_H -#include "src/servers/Server_Common/Common.h" +#include #define PI 3.14159265358979323846f diff --git a/src/common/Version.cpp b/src/common/Version.cpp new file mode 100644 index 00000000..f526b0a4 --- /dev/null +++ b/src/common/Version.cpp @@ -0,0 +1,10 @@ +#include "Version.h" + +namespace Core { + namespace Version { + + const std::string GIT_HASH = "1673292b62618715cecd0656402e934709779f0e"; + const std::string VERSION = "-128-NOTFOUND"; + + } /* Version */ +} /* Core */ diff --git a/src/servers/Server_Common/Version.cpp.in b/src/common/Version.cpp.in similarity index 100% rename from src/servers/Server_Common/Version.cpp.in rename to src/common/Version.cpp.in diff --git a/src/servers/Server_Common/Version.h b/src/common/Version.h similarity index 100% rename from src/servers/Server_Common/Version.h rename to src/common/Version.h diff --git a/src/servers/CMakeLists.txt b/src/servers/CMakeLists.txt index 6387b188..afd85d75 100644 --- a/src/servers/CMakeLists.txt +++ b/src/servers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6) -project (Sapphire_root) +project (Sapphire) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) @@ -9,7 +9,6 @@ set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) include_directories("${PROJECT_INCLUDE_DIR}") include_directories("${PROJECT_SOURCE_DIR}") -add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Common) add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Lobby) add_subdirectory(${PROJECT_SOURCE_DIR}/Server_REST) add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Zone) diff --git a/src/servers/Server_Common/Database/DatabaseDef.h b/src/servers/Server_Common/Database/DatabaseDef.h deleted file mode 100644 index 4009b25c..00000000 --- a/src/servers/Server_Common/Database/DatabaseDef.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _DATABASEDEF_H -#define _DATABASEDEF_H - -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" -#include -#include -#include -#include - -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; - -#endif diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/Server_Lobby/GameConnection.cpp index 1256dca2..b5da8dd4 100644 --- a/src/servers/Server_Lobby/GameConnection.cpp +++ b/src/servers/Server_Lobby/GameConnection.cpp @@ -1,12 +1,13 @@ -#include -#include -#include -#include -#include -#include -#include -#include "Server_Common/Network/GamePacketParser.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -21,7 +22,6 @@ #include "RestConnector.h" #include "LobbySession.h" #include "Forwards.h" -#include "src/servers/Server_Common/Crypt/blowfish.h" diff --git a/src/servers/Server_Lobby/GameConnection.h b/src/servers/Server_Lobby/GameConnection.h index 3d97e0f0..5af52cc5 100644 --- a/src/servers/Server_Lobby/GameConnection.h +++ b/src/servers/Server_Lobby/GameConnection.h @@ -1,17 +1,16 @@ #ifndef GAMECONNECTION_H #define GAMECONNECTION_H -#include -#include -#include +#include +#include +#include + +#include +#include +#include -#include -#include #include "LobbyPacketContainer.h" - -#include - #include "Forwards.h" #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer ) @@ -84,4 +83,4 @@ public: } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.cpp b/src/servers/Server_Lobby/LobbyPacketContainer.cpp index 052e92c3..30870ff5 100644 --- a/src/servers/Server_Lobby/LobbyPacketContainer.cpp +++ b/src/servers/Server_Lobby/LobbyPacketContainer.cpp @@ -1,7 +1,7 @@ #include "LobbyPacketContainer.h" -#include -#include -#include +#include +#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.h b/src/servers/Server_Lobby/LobbyPacketContainer.h index 970cef15..d5812402 100644 --- a/src/servers/Server_Lobby/LobbyPacketContainer.h +++ b/src/servers/Server_Lobby/LobbyPacketContainer.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Lobby/RestConnector.cpp b/src/servers/Server_Lobby/RestConnector.cpp index d37667a6..667bff52 100644 --- a/src/servers/Server_Lobby/RestConnector.cpp +++ b/src/servers/Server_Lobby/RestConnector.cpp @@ -1,8 +1,8 @@ #include "RestConnector.h" #include "LobbySession.h" #include "ServerLobby.h" -#include -#include +#include +#include #include #include diff --git a/src/servers/Server_Lobby/ServerLobby.cpp b/src/servers/Server_Lobby/ServerLobby.cpp index 9d0a6d3c..9c0e05d3 100644 --- a/src/servers/Server_Lobby/ServerLobby.cpp +++ b/src/servers/Server_Lobby/ServerLobby.cpp @@ -3,12 +3,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include //#include "LobbySession.h" diff --git a/src/servers/Server_Lobby/ServerLobby.h b/src/servers/Server_Lobby/ServerLobby.h index 6b3b175f..9c0da9b5 100644 --- a/src/servers/Server_Lobby/ServerLobby.h +++ b/src/servers/Server_Lobby/ServerLobby.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "Forwards.h" diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp index 724475b8..3cf47acb 100644 --- a/src/servers/Server_REST/PlayerMinimal.cpp +++ b/src/servers/Server_REST/PlayerMinimal.cpp @@ -1,10 +1,10 @@ #include "PlayerMinimal.h" -#include -#include -#include +#include +#include +#include -#include +#include extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_REST/SapphireAPI.cpp b/src/servers/Server_REST/SapphireAPI.cpp index 5fbc108e..5372232d 100644 --- a/src/servers/Server_REST/SapphireAPI.cpp +++ b/src/servers/Server_REST/SapphireAPI.cpp @@ -1,5 +1,5 @@ #include "SapphireAPI.h" -#include +#include #include "Session.h" #include "PlayerMinimal.h" #include @@ -11,7 +11,7 @@ #include #include -#include +#include #include Core::Network::SapphireAPI::SapphireAPI() diff --git a/src/servers/Server_REST/main.cpp b/src/servers/Server_REST/main.cpp index 88500536..9093ee8d 100644 --- a/src/servers/Server_REST/main.cpp +++ b/src/servers/Server_REST/main.cpp @@ -6,21 +6,20 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include - -#include -#include -#include -#include +#include +#include +#include +#include //Added for the default_resource example #include diff --git a/src/servers/Server_Zone/Action/Action.cpp b/src/servers/Server_Zone/Action/Action.cpp index 1405f45a..56512f09 100644 --- a/src/servers/Server_Zone/Action/Action.cpp +++ b/src/servers/Server_Zone/Action/Action.cpp @@ -1,6 +1,6 @@ #include "Action.h" -#include +#include Core::Action::Action::Action() diff --git a/src/servers/Server_Zone/Action/Action.h b/src/servers/Server_Zone/Action/Action.h index 3c270180..8cd4c3cc 100644 --- a/src/servers/Server_Zone/Action/Action.h +++ b/src/servers/Server_Zone/Action/Action.h @@ -1,10 +1,11 @@ #ifndef _ACTION_H_ #define _ACTION_H_ -#include +#include #include "../Forwards.h" -namespace Core { namespace Action { +namespace Core { +namespace Action { class Action { diff --git a/src/servers/Server_Zone/Action/ActionCast.cpp b/src/servers/Server_Zone/Action/ActionCast.cpp index 7fc79ea3..002504fd 100644 --- a/src/servers/Server_Zone/Action/ActionCast.cpp +++ b/src/servers/Server_Zone/Action/ActionCast.cpp @@ -1,10 +1,10 @@ #include "ActionCast.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/Server_Zone/Action/ActionCollision.cpp b/src/servers/Server_Zone/Action/ActionCollision.cpp index 6eb11182..8a42d3c1 100644 --- a/src/servers/Server_Zone/Action/ActionCollision.cpp +++ b/src/servers/Server_Zone/Action/ActionCollision.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include "ActionCollision.h" #include "Actor/Actor.h" diff --git a/src/servers/Server_Zone/Action/ActionCollision.h b/src/servers/Server_Zone/Action/ActionCollision.h index db3f7120..f70f6f7a 100644 --- a/src/servers/Server_Zone/Action/ActionCollision.h +++ b/src/servers/Server_Zone/Action/ActionCollision.h @@ -1,7 +1,7 @@ #ifndef _ACTIONCOLLISION_H #define _ACTIONCOLLISION_H -#include +#include #include "Actor/Actor.h" #include "Action.h" diff --git a/src/servers/Server_Zone/Action/ActionMount.cpp b/src/servers/Server_Zone/Action/ActionMount.cpp index b45b460f..6ff6c8b9 100644 --- a/src/servers/Server_Zone/Action/ActionMount.cpp +++ b/src/servers/Server_Zone/Action/ActionMount.cpp @@ -1,10 +1,10 @@ #include "ActionMount.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/Server_Zone/Action/ActionTeleport.cpp b/src/servers/Server_Zone/Action/ActionTeleport.cpp index c201b0cc..7e8cec18 100644 --- a/src/servers/Server_Zone/Action/ActionTeleport.cpp +++ b/src/servers/Server_Zone/Action/ActionTeleport.cpp @@ -1,8 +1,8 @@ #include "ActionTeleport.h" -#include -#include -#include +#include +#include +#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/Server_Zone/Action/EventAction.cpp b/src/servers/Server_Zone/Action/EventAction.cpp index 5e6a9cf3..b174bdad 100644 --- a/src/servers/Server_Zone/Action/EventAction.cpp +++ b/src/servers/Server_Zone/Action/EventAction.cpp @@ -1,12 +1,12 @@ -#include -#include -#include +#include +#include +#include #include "EventAction.h" #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Server_Zone/Actor/Player.h" -#include "Server_Zone/Event/Event.h" +#include "Actor/Player.h" +#include "Event/Event.h" extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Action/EventAction.h b/src/servers/Server_Zone/Action/EventAction.h index 6f8e5614..f0857d34 100644 --- a/src/servers/Server_Zone/Action/EventAction.h +++ b/src/servers/Server_Zone/Action/EventAction.h @@ -1,7 +1,7 @@ #ifndef _EVENTACTION_H_ #define _EVENTACTION_H_ -#include +#include #include "../Forwards.h" #include "Action.h" diff --git a/src/servers/Server_Zone/Action/EventItemAction.cpp b/src/servers/Server_Zone/Action/EventItemAction.cpp index 6c85b183..3a8c3f78 100644 --- a/src/servers/Server_Zone/Action/EventItemAction.cpp +++ b/src/servers/Server_Zone/Action/EventItemAction.cpp @@ -1,8 +1,8 @@ #include "EventItemAction.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Actor/Actor.cpp b/src/servers/Server_Zone/Actor/Actor.cpp index 3439fef7..dca46593 100644 --- a/src/servers/Server_Zone/Actor/Actor.cpp +++ b/src/servers/Server_Zone/Actor/Actor.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Forwards.h" #include "Action/Action.h" diff --git a/src/servers/Server_Zone/Actor/Actor.h b/src/servers/Server_Zone/Actor/Actor.h index 35547b01..aee58d2e 100644 --- a/src/servers/Server_Zone/Actor/Actor.h +++ b/src/servers/Server_Zone/Actor/Actor.h @@ -1,7 +1,7 @@ #ifndef _ACTOR_H_ #define _ACTOR_H_ -#include +#include #include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Actor/BattleNpc.cpp b/src/servers/Server_Zone/Actor/BattleNpc.cpp index e76003d7..46ab6a8b 100644 --- a/src/servers/Server_Zone/Actor/BattleNpc.cpp +++ b/src/servers/Server_Zone/Actor/BattleNpc.cpp @@ -4,10 +4,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Player.h" #include "BattleNpc.h" diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp index 83c416bc..c9fdd3f2 100644 --- a/src/servers/Server_Zone/Actor/Player.cpp +++ b/src/servers/Server_Zone/Actor/Player.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Session.h" #include "Player.h" diff --git a/src/servers/Server_Zone/Actor/Player.h b/src/servers/Server_Zone/Actor/Player.h index c00cc37f..6bc4c30d 100644 --- a/src/servers/Server_Zone/Actor/Player.h +++ b/src/servers/Server_Zone/Actor/Player.h @@ -3,7 +3,7 @@ #include "Forwards.h" -#include +#include #include "Actor.h" #include "Inventory/Inventory.h" diff --git a/src/servers/Server_Zone/Actor/PlayerEvent.cpp b/src/servers/Server_Zone/Actor/PlayerEvent.cpp index 0f4b5aae..a48aea17 100644 --- a/src/servers/Server_Zone/Actor/PlayerEvent.cpp +++ b/src/servers/Server_Zone/Actor/PlayerEvent.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Player.h" diff --git a/src/servers/Server_Zone/Actor/PlayerInventory.cpp b/src/servers/Server_Zone/Actor/PlayerInventory.cpp index c35fb10a..6e201984 100644 --- a/src/servers/Server_Zone/Actor/PlayerInventory.cpp +++ b/src/servers/Server_Zone/Actor/PlayerInventory.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include "Player.h" diff --git a/src/servers/Server_Zone/Actor/PlayerQuest.cpp b/src/servers/Server_Zone/Actor/PlayerQuest.cpp index fa938d33..14246254 100644 --- a/src/servers/Server_Zone/Actor/PlayerQuest.cpp +++ b/src/servers/Server_Zone/Actor/PlayerQuest.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/GameConnection.h" diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp index d0c23880..1e337fd2 100644 --- a/src/servers/Server_Zone/Actor/PlayerSql.cpp +++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp @@ -1,13 +1,13 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt index bfb8183f..2e68e3bf 100644 --- a/src/servers/Server_Zone/CMakeLists.txt +++ b/src/servers/Server_Zone/CMakeLists.txt @@ -13,7 +13,7 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Event/*.h Inventory/*.h Linkshell/*.h - Math/*.h + Math/*.h Network/*.h Network/Handlers/*.h Network/PacketWrappers/*.h @@ -29,7 +29,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Event/*.c* Inventory/*.c* Linkshell/*.c* - Math/*.c* + Math/*.c* Network/*.c* Network/Handlers/*.c* Network/PacketWrappers/*.c* diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommand.h b/src/servers/Server_Zone/DebugCommand/DebugCommand.h index c6131a75..03c01a30 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommand.h +++ b/src/servers/Server_Zone/DebugCommand/DebugCommand.h @@ -1,7 +1,7 @@ #ifndef _GAMECOMMAND_H_ #define _GAMECOMMAND_H_ -#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp index dceb3432..dccb6ce8 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp @@ -1,14 +1,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "DebugCommand.h" #include "DebugCommandHandler.h" diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h index 4da90f29..930da36b 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h +++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h @@ -4,7 +4,7 @@ #include #include "DebugCommand.h" -#include +#include #include "Forwards.h" namespace Core { diff --git a/src/servers/Server_Zone/Event/EventHelper.cpp b/src/servers/Server_Zone/Event/EventHelper.cpp index 0ec74b98..9d90cc3e 100644 --- a/src/servers/Server_Zone/Event/EventHelper.cpp +++ b/src/servers/Server_Zone/Event/EventHelper.cpp @@ -1,7 +1,7 @@ #include "EventHelper.h" #include "Event.h" -#include -#include +#include +#include extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Inventory/Inventory.cpp b/src/servers/Server_Zone/Inventory/Inventory.cpp index dbcd2080..7d2275a4 100644 --- a/src/servers/Server_Zone/Inventory/Inventory.cpp +++ b/src/servers/Server_Zone/Inventory/Inventory.cpp @@ -1,7 +1,8 @@ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Inventory.h" @@ -18,7 +19,6 @@ #include "../Forwards.h" #include "Network/PacketWrappers/ActorControlPacket143.h" -#include extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Inventory/Inventory.h b/src/servers/Server_Zone/Inventory/Inventory.h index 508c4733..8be14a2d 100644 --- a/src/servers/Server_Zone/Inventory/Inventory.h +++ b/src/servers/Server_Zone/Inventory/Inventory.h @@ -1,7 +1,7 @@ #ifndef INVENTORY_H_ #define INVENTORY_H_ #include -#include +#include #include "../Forwards.h" namespace Core diff --git a/src/servers/Server_Zone/Inventory/Item.cpp b/src/servers/Server_Zone/Inventory/Item.cpp index 2844c73e..e77c4ca4 100644 --- a/src/servers/Server_Zone/Inventory/Item.cpp +++ b/src/servers/Server_Zone/Inventory/Item.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "Item.h" extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Inventory/Item.h b/src/servers/Server_Zone/Inventory/Item.h index fdb3e6a3..dc811e37 100644 --- a/src/servers/Server_Zone/Inventory/Item.h +++ b/src/servers/Server_Zone/Inventory/Item.h @@ -1,7 +1,7 @@ #ifndef _ITEM_H_ #define _ITEM_H_ -#include +#include namespace Core { diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.cpp b/src/servers/Server_Zone/Inventory/ItemContainer.cpp index baa3da34..109cc17c 100644 --- a/src/servers/Server_Zone/Inventory/ItemContainer.cpp +++ b/src/servers/Server_Zone/Inventory/ItemContainer.cpp @@ -1,9 +1,9 @@ #include "../Forwards.h" #include "ItemContainer.h" -#include -#include -#include +#include +#include +#include #include "Actor/Player.h" diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.h b/src/servers/Server_Zone/Inventory/ItemContainer.h index 8147905d..6d2fcc4f 100644 --- a/src/servers/Server_Zone/Inventory/ItemContainer.h +++ b/src/servers/Server_Zone/Inventory/ItemContainer.h @@ -3,7 +3,7 @@ #include -#include +#include #include "../Forwards.h" diff --git a/src/servers/Server_Zone/Linkshell/Linkshell.h b/src/servers/Server_Zone/Linkshell/Linkshell.h index 62ca1781..890f97fe 100644 --- a/src/servers/Server_Zone/Linkshell/Linkshell.h +++ b/src/servers/Server_Zone/Linkshell/Linkshell.h @@ -1,7 +1,7 @@ #ifndef CORE_LINKSHELL_H #define CORE_LINKSHELL_H -#include +#include #include namespace Core diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp b/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp index e584bced..f2778a73 100644 --- a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp +++ b/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp @@ -1,7 +1,7 @@ #include "LinkshellMgr.h" -#include #include -#include +#include +#include #include "Linkshell.h" diff --git a/src/servers/Server_Zone/Math/CalcBattle.cpp b/src/servers/Server_Zone/Math/CalcBattle.cpp index f68d1872..12f93936 100644 --- a/src/servers/Server_Zone/Math/CalcBattle.cpp +++ b/src/servers/Server_Zone/Math/CalcBattle.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Actor/Actor.h" #include "Actor/Player.h" #include "CalcBattle.h" diff --git a/src/servers/Server_Zone/Math/CalcBattle.h b/src/servers/Server_Zone/Math/CalcBattle.h index b373ac99..8c43107f 100644 --- a/src/servers/Server_Zone/Math/CalcBattle.h +++ b/src/servers/Server_Zone/Math/CalcBattle.h @@ -1,7 +1,7 @@ #ifndef _CALCBATTLE_H #define _CALCBATTLE_H -#include +#include #include "Actor/Actor.h" using namespace Core::Entity; diff --git a/src/servers/Server_Zone/Math/CalcStats.cpp b/src/servers/Server_Zone/Math/CalcStats.cpp index 0e31d183..2e390887 100644 --- a/src/servers/Server_Zone/Math/CalcStats.cpp +++ b/src/servers/Server_Zone/Math/CalcStats.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Actor/Actor.h" #include "Actor/Player.h" diff --git a/src/servers/Server_Zone/Math/CalcStats.h b/src/servers/Server_Zone/Math/CalcStats.h index 94a0a324..2bf17da5 100644 --- a/src/servers/Server_Zone/Math/CalcStats.h +++ b/src/servers/Server_Zone/Math/CalcStats.h @@ -1,7 +1,7 @@ #ifndef _CALCSTATS_H #define _CALCSTATS_H -#include +#include #include "Actor/Actor.h" using namespace Core::Entity; diff --git a/src/servers/Server_Zone/Network/GameConnection.cpp b/src/servers/Server_Zone/Network/GameConnection.cpp index 1a52c5f6..817a2278 100644 --- a/src/servers/Server_Zone/Network/GameConnection.cpp +++ b/src/servers/Server_Zone/Network/GameConnection.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "GameConnection.h" diff --git a/src/servers/Server_Zone/Network/GameConnection.h b/src/servers/Server_Zone/Network/GameConnection.h index d4e2dfc2..2d283067 100644 --- a/src/servers/Server_Zone/Network/GameConnection.h +++ b/src/servers/Server_Zone/Network/GameConnection.h @@ -1,11 +1,11 @@ #ifndef GAMECONNECTION_H #define GAMECONNECTION_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp index 86404013..b1494413 100644 --- a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp +++ b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp index b3df64e5..f9f6fb8d 100644 --- a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/GameConnection.h" #include "Session.h" diff --git a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp index 8a9f814b..54875ca5 100644 --- a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp index 923b37b9..736a1fd8 100644 --- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp index 52aaaad3..3f87d2ab 100644 --- a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp +++ b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp index 4fc80e64..fe58f3aa 100644 --- a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp b/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp index eaaa1d2b..38b339c7 100644 --- a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp +++ b/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h index 6a6ae79b..0bd3d00e 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL142_H #define _ACTORCONTROL142_H -#include -#include +#include +#include #include "Forwards.h" namespace Core { @@ -46,4 +46,4 @@ private: } } -#endif /*_ACTORCONTROL142_H*/ \ No newline at end of file +#endif /*_ACTORCONTROL142_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h index 09dafb08..48287018 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL143_H #define _ACTORCONTROL143_H -#include -#include +#include +#include #include "Forwards.h" @@ -49,4 +49,4 @@ private: } } -#endif /*_ACTORCONTROL143_H*/ \ No newline at end of file +#endif /*_ACTORCONTROL143_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h index ab5d3dad..b2104e96 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL144_H #define _ACTORCONTROL144_H -#include -#include +#include +#include namespace Core { namespace Network { @@ -47,4 +47,4 @@ private: } } -#endif /*_ACTORCONTROL144_H*/ \ No newline at end of file +#endif /*_ACTORCONTROL144_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h index 1a99ed71..f2788a9b 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h @@ -1,8 +1,8 @@ #ifndef _CHATPACKET_H #define _CHATPACKET_H -#include -#include +#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h index 6e55dc76..774f87c2 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTFINISH_H #define _EVENTFINISH_H -#include +#include namespace Core { namespace Network { @@ -41,4 +41,4 @@ private: } } -#endif /*_EVENTFINISH_H*/ \ No newline at end of file +#endif /*_EVENTFINISH_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h index a3505fa2..44dba83d 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTPLAY_H #define _EVENTPLAY_H -#include +#include #include "Forwards.h" namespace Core { @@ -52,4 +52,4 @@ private: } } -#endif /*_EVENTPLAY_H*/ \ No newline at end of file +#endif /*_EVENTPLAY_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h index 6872fa7d..2109c856 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTSTART_H #define _EVENTSTART_H -#include +#include #include "Forwards.h" namespace Core { @@ -47,4 +47,4 @@ private: } } -#endif /*_EVENTSTART_H*/ \ No newline at end of file +#endif /*_EVENTSTART_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h index d57e6685..db426e0a 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h @@ -1,8 +1,8 @@ #ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H #define _CORE_NETWORK_PACKETS_INITUIPACKET_H -#include -#include +#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h index 88536c0d..bee13f75 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h @@ -1,7 +1,7 @@ #ifndef _MODELEQUIPPACKET_H #define _MODELEQUIPPACKET_H -#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h index abc7f9d6..1771d801 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h @@ -1,9 +1,9 @@ #ifndef _MOVEACTORPACKET_H #define _MOVEACTORPACKET_H -#include -#include -#include +#include +#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h index 8a3e1836..88c23887 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h @@ -1,7 +1,7 @@ #ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H #define _CORE_NETWORK_PACKETS_PINGPACKET_H -#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h index 4ee95f5b..662f9574 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h @@ -1,9 +1,9 @@ #ifndef _PLAYERSPAWN_H #define _PLAYERSPAWN_H -#include -#include -#include +#include +#include +#include #include "Actor/Player.h" #include "Forwards.h" #include "Inventory/Inventory.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h index ac0c4826..920a4a80 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h @@ -1,7 +1,7 @@ #ifndef _PLAYERSTATE_H #define _PLAYERSTATE_H -#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h index 1c846b11..4c462c5f 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h @@ -1,7 +1,7 @@ #ifndef _QUESTMESSAGE_H #define _QUESTMESSAGE_H -#include +#include #include "Actor/Player.h" #include "Forwards.h" @@ -40,4 +40,4 @@ private: } } -#endif /* _QUESTMESSAGE_H */ \ No newline at end of file +#endif /* _QUESTMESSAGE_H */ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h index 07ec036e..3829598b 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h @@ -1,8 +1,8 @@ #ifndef _SERVERNOTICEPACKET_H #define _SERVERNOTICEPACKET_H -#include -#include +#include +#include #include "Forwards.h" namespace Core { @@ -35,4 +35,4 @@ private: } } -#endif /*_SERVERNOTICEPACKET_H*/ \ No newline at end of file +#endif /*_SERVERNOTICEPACKET_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h index 927d968f..dc3d2096 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h @@ -1,7 +1,7 @@ #ifndef _UPDATEHPMPTP_H #define _UPDATEHPMPTP_H -#include +#include #include #include "Forwards.h" @@ -37,4 +37,4 @@ private: } } -#endif /*_UPDATEHPMPTP_H*/ \ No newline at end of file +#endif /*_UPDATEHPMPTP_H*/ diff --git a/src/servers/Server_Zone/Script/NativeScriptManager.h b/src/servers/Server_Zone/Script/NativeScriptManager.h index 43db0d76..eed78851 100644 --- a/src/servers/Server_Zone/Script/NativeScriptManager.h +++ b/src/servers/Server_Zone/Script/NativeScriptManager.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include "ScriptLoader.h" @@ -72,4 +72,4 @@ namespace Scripting { } } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Zone/Script/ScriptLoader.cpp b/src/servers/Server_Zone/Script/ScriptLoader.cpp index b480e06e..81b9abfe 100644 --- a/src/servers/Server_Zone/Script/ScriptLoader.cpp +++ b/src/servers/Server_Zone/Script/ScriptLoader.cpp @@ -1,7 +1,7 @@ #include "ScriptLoader.h" -#include -#include +#include +#include #include "ServerZone.h" #include @@ -189,4 +189,4 @@ void Core::Scripting::ScriptLoader::findScripts( std::set< Core::Scripting::Scri scripts.insert( it->second ); } } -} \ No newline at end of file +} diff --git a/src/servers/Server_Zone/Script/ScriptManager.cpp b/src/servers/Server_Zone/Script/ScriptManager.cpp index 93210400..d475639c 100644 --- a/src/servers/Server_Zone/Script/ScriptManager.cpp +++ b/src/servers/Server_Zone/Script/ScriptManager.cpp @@ -1,5 +1,6 @@ -#include -#include +#include +#include +#include #include "NativeScriptManager.h" @@ -19,7 +20,6 @@ #include #include -#include // enable the ambiguity fix for every platform to avoid #define nonsense #define WIN_AMBIGUITY_FIX diff --git a/src/servers/Server_Zone/Script/ScriptManager.h b/src/servers/Server_Zone/Script/ScriptManager.h index f87d434f..958412a0 100644 --- a/src/servers/Server_Zone/Script/ScriptManager.h +++ b/src/servers/Server_Zone/Script/ScriptManager.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "Forwards.h" namespace Core diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/Server_Zone/ServerZone.cpp index eccb7ea4..d97a7d33 100644 --- a/src/servers/Server_Zone/ServerZone.cpp +++ b/src/servers/Server_Zone/ServerZone.cpp @@ -1,22 +1,22 @@ #include "ServerZone.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "Network/GameConnection.h" #include "Session.h" diff --git a/src/servers/Server_Zone/ServerZone.h b/src/servers/Server_Zone/ServerZone.h index 724f031e..64db1136 100644 --- a/src/servers/Server_Zone/ServerZone.h +++ b/src/servers/Server_Zone/ServerZone.h @@ -1,7 +1,7 @@ #ifndef __GAMESERVER_H #define __GAMESERVER_H -#include +#include #include #include diff --git a/src/servers/Server_Zone/Session.cpp b/src/servers/Server_Zone/Session.cpp index 03965da3..bef1b516 100644 --- a/src/servers/Server_Zone/Session.cpp +++ b/src/servers/Server_Zone/Session.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Network/GameConnection.h" #include "Session.h" diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp index 6a4d439c..1a4063f8 100644 --- a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp +++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/servers/Server_Zone/Zone/Zone.cpp b/src/servers/Server_Zone/Zone/Zone.cpp index 9da356eb..c1b6dbc6 100644 --- a/src/servers/Server_Zone/Zone/Zone.cpp +++ b/src/servers/Server_Zone/Zone/Zone.cpp @@ -1,16 +1,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Zone.h" #include "ZoneMgr.h" diff --git a/src/servers/Server_Zone/Zone/Zone.h b/src/servers/Server_Zone/Zone/Zone.h index fa318535..4ea39cb1 100644 --- a/src/servers/Server_Zone/Zone/Zone.h +++ b/src/servers/Server_Zone/Zone/Zone.h @@ -2,7 +2,7 @@ #define _ZONE_H #include -#include +#include #include "Cell.h" #include "CellHandler.h" diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.cpp b/src/servers/Server_Zone/Zone/ZoneMgr.cpp index 100422f4..e644f4b5 100644 --- a/src/servers/Server_Zone/Zone/ZoneMgr.cpp +++ b/src/servers/Server_Zone/Zone/ZoneMgr.cpp @@ -1,12 +1,12 @@ -#include -#include +#include +#include +#include #include #include "ZoneMgr.h" #include "Zone.h" #include "ZonePosition.h" -#include extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Zone/ZonePosition.h b/src/servers/Server_Zone/Zone/ZonePosition.h index 0b4cad7c..89177d6e 100644 --- a/src/servers/Server_Zone/Zone/ZonePosition.h +++ b/src/servers/Server_Zone/Zone/ZonePosition.h @@ -1,7 +1,7 @@ #ifndef _ZONELINE_H #define _ZONELINE_H -#include +#include namespace Core { diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp index 3e129189..2295bcfd 100644 --- a/src/tools/exd_common_gen/main.cpp +++ b/src/tools/exd_common_gen/main.cpp @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp index a1e51ccd..8c26137e 100644 --- a/src/tools/exd_struct_gen/main.cpp +++ b/src/tools/exd_struct_gen/main.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp index 0ba59997..a3b50104 100644 --- a/src/tools/exd_struct_test/main.cpp +++ b/src/tools/exd_struct_test/main.cpp @@ -10,7 +10,7 @@ #include #include #include "ExdDataGenerated.h" -#include +#include #include #include #include diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index acd644ef..41853632 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include