Moved and renamed Server_Common, now just src/common

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")

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"

src/common/Database/DatabaseDef.h

@@ -0,0 +1,12 @@
+#ifndef _DATABASEDEF_H
+#define _DATABASEDEF_H
+
+#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
+#include <common/Database/DbLoader.h>
+#include <common/Database/CharaDbConnection.h>
+#include <common/Database/DbWorkerPool.h>
+#include <common/Database/PreparedStatement.h>
+
+extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
+
+#endif

src/common/Database/DbConnection.h

@@ -6,8 +6,7 @@
 #include <mutex>
 #include <string>
 #include <vector>
-#include "src/servers/Server_Common/Util/LockedWaitQueue.h"
-#include <Server_Common/Util/LockedWaitQueue.h>
+#include <common/Util/LockedWaitQueue.h>
 #include <boost/scoped_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 

src/common/Database/DbWorkerPool.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 #include <ResultSet.h>
-#include <Server_Common/Util/LockedWaitQueue.h>
+#include <common/Util/LockedWaitQueue.h>
 #include "DbConnection.h"
 namespace Core
 {

src/common/Network/Acceptor.h

@@ -5,7 +5,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include "src/servers/Server_Common/Forwards.h"
+#include <common/Forwards.h>
 
 namespace Core 
 {
@@ -75,4 +75,4 @@ namespace Core
 
    }
 }
-#endif
+#endif

src/common/Network/Connection.h

@@ -9,7 +9,7 @@
 #include <list>
 #include <boost/cstdint.hpp>
 
-#include "src/servers/Server_Common/Forwards.h"
+#include <common/Forwards.h>
 #include "Acceptor.h"
 
 
@@ -141,4 +141,4 @@ namespace Core {
 
 
 }
-#endif
+#endif

src/common/Network/GamePacket.h

@@ -2,7 +2,7 @@
 #define _GAMEPACKET_H_
 
 #include "CommonNetwork.h"
-#include "src/servers/Server_Common/Forwards.h"
+#include <common/Forwards.h>
 #include <stdint.h>
 #include <string.h>
 

src/common/Network/PacketContainer.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "src/servers/Server_Common/Common.h"
+#include <common/Common.h>
 #include "CommonNetwork.h"
 #include "GamePacket.h"
 

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 <common/Common.h>
+#include <common/Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {

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 <common/Common.h>
+#include <common/Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {
@@ -140,4 +140,4 @@ struct FFXIVIpcLobbyError : FFXIVIpcBasePacket<LobbyError>
 }
 }
 }
-#endif
+#endif

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 <common/Common.h>
+#include <common/Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {

src/common/Util/UtilMath.h

@@ -1,7 +1,7 @@
 #ifndef _UTILMATH_H
 #define _UTILMATH_H
 
-#include "src/servers/Server_Common/Common.h"
+#include <common/Common.h>
 
 #define PI 3.14159265358979323846f
 

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 */

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)

src/servers/Server_Common/Database/DatabaseDef.h

@@ -1,12 +0,0 @@
-#ifndef _DATABASEDEF_H
-#define _DATABASEDEF_H
-
-#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
-#include <Server_Common/Database/DbLoader.h>
-#include <Server_Common/Database/CharaDbConnection.h>
-#include <Server_Common/Database/DbWorkerPool.h>
-#include <Server_Common/Database/PreparedStatement.h>
-
-extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
-
-#endif

src/servers/Server_Lobby/GameConnection.cpp

@@ -1,12 +1,13 @@
-#include <src/servers/Server_Common/Common.h>
-#include <src/servers/Server_Common/Network/CommonNetwork.h>
-#include <src/servers/Server_Common/Util/Util.h>
-#include <src/servers/Server_Common/Logging/Logger.h>
-#include <src/servers/Server_Common/Network/GamePacket.h>
-#include <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h>
-#include "Server_Common/Network/GamePacketParser.h"
-#include <src/servers/Server_Common/Crypt/md5.h>
+#include <common/Common.h>
+#include <common/Network/CommonNetwork.h>
+#include <common/Util/Util.h>
+#include <common/Logging/Logger.h>
+#include <common/Network/GamePacket.h>
+#include <common/Network/GamePacketNew.h>
+#include <common/Network/PacketDef/Lobby/ServerLobbyDef.h>
+#include <common/Network/GamePacketParser.h>
+#include <common/Crypt/md5.h>
+#include <common/Crypt/blowfish.h>
 
 #include <boost/format.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -21,7 +22,6 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 #include "Forwards.h"
-#include "src/servers/Server_Common/Crypt/blowfish.h"
 
 
 

src/servers/Server_Lobby/GameConnection.h

@@ -1,17 +1,16 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <src/servers/Server_Common/Network/Connection.h>
-#include <src/servers/Server_Common/Network/Acceptor.h>
-#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <common/Network/Connection.h>
+#include <common/Network/Acceptor.h>
+#include <common/Network/CommonNetwork.h>
+
+#include <common/Network/GamePacket.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Util/LockedQueue.h>
 
-#include <src/servers/Server_Common/Network/GamePacket.h>
-#include <src/servers/Server_Common/Network/PacketContainer.h>
 #include "LobbyPacketContainer.h"
 
-
-#include <src/servers/Server_Common/Util/LockedQueue.h>
-
 #include "Forwards.h"
 
 #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer )
@@ -84,4 +83,4 @@ public:
 }
 
 
-#endif
+#endif

src/servers/Server_Lobby/LobbyPacketContainer.cpp

@@ -1,7 +1,7 @@
 #include "LobbyPacketContainer.h"
-#include <src/servers/Server_Common/Network/GamePacket.h>
-#include <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Crypt/blowfish.h>
+#include <common/Network/GamePacket.h>
+#include <common/Network/GamePacketNew.h>
+#include <common/Crypt/blowfish.h>
 
 namespace Core {
    namespace Network {

src/servers/Server_Lobby/LobbyPacketContainer.h

@@ -4,8 +4,8 @@
 #include <vector>
 #include <string.h>
 
-#include <src/servers/Server_Common/Network/CommonNetwork.h>
-#include <src/servers/Server_Common/Util/Util.h>
+#include <common/Network/CommonNetwork.h>
+#include <common/Util/Util.h>
 
 #include "Forwards.h"
 

src/servers/Server_Lobby/RestConnector.cpp

@@ -1,8 +1,8 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 #include "ServerLobby.h"
-#include <src/servers/Server_Common/Logging/Logger.h>
-#include <src/servers/Server_Common/Crypt/base64.h>
+#include <common/Logging/Logger.h>
+#include <common/Crypt/base64.h>
 #include <time.h>
 #include <iomanip>
 

src/servers/Server_Lobby/ServerLobby.cpp

@@ -3,12 +3,12 @@
 #include <time.h>
 #include <map>
 
-#include <src/servers/Server_Common/Network/Hive.h>
-#include <src/servers/Server_Common/Network/Acceptor.h>
+#include <common/Network/Hive.h>
+#include <common/Network/Acceptor.h>
 
-#include <src/servers/Server_Common/Version.h>
-#include <src/servers/Server_Common/Logging/Logger.h>
-#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <common/Version.h>
+#include <common/Logging/Logger.h>
+#include <common/Config/XMLConfig.h>
 
 //#include "LobbySession.h"
 

src/servers/Server_Lobby/ServerLobby.h

@@ -6,7 +6,7 @@
 #include <map>
 
 #include <boost/shared_ptr.hpp>
-#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <common/Config/XMLConfig.h>
 
 #include "Forwards.h"
 

src/servers/Server_REST/PlayerMinimal.cpp

@@ -1,10 +1,10 @@
 #include "PlayerMinimal.h"
 
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Common.h>
-#include <Server_Common/Exd/ExdData.h>
+#include <common/Util/Util.h>
+#include <common/Common.h>
+#include <common/Exd/ExdData.h>
 
-#include <Server_Common/Database/DatabaseDef.h>
+#include <common/Database/DatabaseDef.h>
 
 extern Core::Data::ExdData g_exdData;
 

src/servers/Server_REST/SapphireAPI.cpp

@@ -1,5 +1,5 @@
 #include "SapphireAPI.h"
-#include <src/servers/Server_Common/Crypt/base64.h>
+#include <common/Crypt/base64.h>
 #include "Session.h"
 #include "PlayerMinimal.h"
 #include <time.h>
@@ -11,7 +11,7 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <Server_Common/Database/DatabaseDef.h>
+#include <common/Database/DatabaseDef.h>
 #include <boost/make_shared.hpp>
 
 Core::Network::SapphireAPI::SapphireAPI()

src/servers/Server_REST/main.cpp

@@ -6,21 +6,20 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include <src/servers/Server_Common/Logging/Logger.h>
-#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <common/Logging/Logger.h>
+#include <common/Config/XMLConfig.h>
 
-#include <src/servers/Server_Common/Network/Connection.h>
-#include <src/servers/Server_Common/Network/Hive.h>
-#include <src/servers/Server_Common/Network/Acceptor.h>
+#include <common/Network/Connection.h>
+#include <common/Network/Hive.h>
+#include <common/Network/Acceptor.h>
 
-#include <src/servers/Server_Common/Exd/ExdData.h>
-#include <src/servers/Server_Common/Crypt/base64.h>
+#include <common/Exd/ExdData.h>
+#include <common/Crypt/base64.h>
 
-
-#include <Server_Common/Database/DbLoader.h>
-#include <Server_Common/Database/CharaDbConnection.h>
-#include <Server_Common/Database/DbWorkerPool.h>
-#include <Server_Common/Database/PreparedStatement.h>
+#include <common/Database/DbLoader.h>
+#include <common/Database/CharaDbConnection.h>
+#include <common/Database/DbWorkerPool.h>
+#include <common/Database/PreparedStatement.h>
 
 //Added for the default_resource example
 #include <fstream>

src/servers/Server_Zone/Action/Action.cpp

@@ -1,6 +1,6 @@
 #include "Action.h"
 
-#include <Server_Common/Util/Util.h>
+#include <common/Util/Util.h>
 
 
 Core::Action::Action::Action()

src/servers/Server_Zone/Action/Action.h

@@ -1,10 +1,11 @@
 #ifndef _ACTION_H_
 #define _ACTION_H_
 
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 #include "../Forwards.h"
 
-namespace Core { namespace Action {
+namespace Core {
+namespace Action {
 
    class Action 
    {

src/servers/Server_Zone/Action/ActionCast.cpp

@@ -1,10 +1,10 @@
 #include "ActionCast.h"
 
-#include <Server_Common/Common.h>
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Logging/Logger.h>
+#include <common/Common.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Exd/ExdData.h>
+#include <common/Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/Server_Zone/Action/ActionCollision.cpp

@@ -1,6 +1,6 @@
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Util/UtilMath.h>
+#include <common/Util/Util.h>
+#include <common/Exd/ExdData.h>
+#include <common/Util/UtilMath.h>
 
 #include "ActionCollision.h"
 #include "Actor/Actor.h"

src/servers/Server_Zone/Action/ActionCollision.h

@@ -1,7 +1,7 @@
 #ifndef _ACTIONCOLLISION_H
 #define _ACTIONCOLLISION_H
 
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 
 #include "Actor/Actor.h"
 #include "Action.h"

src/servers/Server_Zone/Action/ActionMount.cpp

@@ -1,10 +1,10 @@
 #include "ActionMount.h"
 
-#include <Server_Common/Common.h>
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Logging/Logger.h>
+#include <common/Common.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Exd/ExdData.h>
+#include <common/Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/Server_Zone/Action/ActionTeleport.cpp

@@ -1,8 +1,8 @@
 #include "ActionTeleport.h"
 
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Logging/Logger.h>
+#include <common/Util/Util.h>
+#include <common/Exd/ExdData.h>
+#include <common/Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/Server_Zone/Action/EventAction.cpp

@@ -1,12 +1,12 @@
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Logging/Logger.h>
-#include <Server_Common/Exd/ExdData.h>
+#include <common/Util/Util.h>
+#include <common/Logging/Logger.h>
+#include <common/Exd/ExdData.h>
 
 #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;

src/servers/Server_Zone/Action/EventAction.h

@@ -1,7 +1,7 @@
 #ifndef _EVENTACTION_H_
 #define _EVENTACTION_H_
 
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 
 #include "../Forwards.h"
 #include "Action.h"

src/servers/Server_Zone/Action/EventItemAction.cpp

@@ -1,8 +1,8 @@
 #include "EventItemAction.h"
 
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Logging/Logger.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Logging/Logger.h>
 
 #include <string.h>
 

src/servers/Server_Zone/Actor/Actor.cpp

@@ -1,8 +1,8 @@
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Network/PacketContainer.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Network/GamePacket.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Exd/ExdData.h>
+#include <common/Network/GamePacket.h>
 
 #include "Forwards.h"
 #include "Action/Action.h"

src/servers/Server_Zone/Actor/Actor.h

@@ -1,7 +1,7 @@
 #ifndef _ACTOR_H_
 #define _ACTOR_H_
 
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"

src/servers/Server_Zone/Actor/BattleNpc.cpp

@@ -4,10 +4,10 @@
 #include <stdint.h>
 #include <cmath>
 
-#include <Server_Common/Logging/Logger.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
+#include <common/Logging/Logger.h>
+#include <common/Exd/ExdData.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
 
 #include "Player.h"
 #include "BattleNpc.h"

src/servers/Server_Zone/Actor/Player.cpp

@@ -1,11 +1,11 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Config/XMLConfig.h>
-#include <Server_Common/Network/GamePacket.h>
-#include <Server_Common/Logging/Logger.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Network/PacketContainer.h>
+#include <common/Common.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Config/XMLConfig.h>
+#include <common/Network/GamePacket.h>
+#include <common/Logging/Logger.h>
+#include <common/Exd/ExdData.h>
+#include <common/Network/PacketContainer.h>
 
 #include "Session.h"
 #include "Player.h"

src/servers/Server_Zone/Actor/Player.h

@@ -3,7 +3,7 @@
 
 #include "Forwards.h"
 
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 
 #include "Actor.h"
 #include "Inventory/Inventory.h"

src/servers/Server_Zone/Actor/PlayerEvent.cpp

@@ -1,8 +1,8 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Network/GamePacket.h>
-#include <Server_Common/Logging/Logger.h>
-#include <Server_Common/Network/PacketContainer.h>
-#include <Server_Common/Config/XMLConfig.h>
+#include <common/Common.h>
+#include <common/Network/GamePacket.h>
+#include <common/Logging/Logger.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Config/XMLConfig.h>
 
 #include "Player.h"
 

src/servers/Server_Zone/Actor/PlayerInventory.cpp

@@ -1,7 +1,7 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Network/GamePacket.h>
-#include <Server_Common/Logging/Logger.h>
+#include <common/Common.h>
+#include <common/Exd/ExdData.h>
+#include <common/Network/GamePacket.h>
+#include <common/Logging/Logger.h>
 
 #include "Player.h"
 

src/servers/Server_Zone/Actor/PlayerQuest.cpp

@@ -1,8 +1,8 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <Server_Common/Network/GamePacket.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Network/PacketContainer.h>
+#include <common/Common.h>
+#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <common/Network/GamePacket.h>
+#include <common/Exd/ExdData.h>
+#include <common/Network/PacketContainer.h>
 
 #include "Network/GameConnection.h"
 

src/servers/Server_Zone/Actor/PlayerSql.cpp

@@ -1,13 +1,13 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Network/GamePacket.h>
-#include <Server_Common/Util/Util.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Config/XMLConfig.h>
-#include <Server_Common/Logging/Logger.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Network/PacketContainer.h>
-#include <Server_Common/Common.h>
-#include <Server_Common/Database/DatabaseDef.h>
+#include <common/Common.h>
+#include <common/Network/GamePacket.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Config/XMLConfig.h>
+#include <common/Logging/Logger.h>
+#include <common/Exd/ExdData.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Common.h>
+#include <common/Database/DatabaseDef.h>
 
 #include <set>
 #include <stdio.h>

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*

src/servers/Server_Zone/DebugCommand/DebugCommand.h

@@ -1,7 +1,7 @@
 #ifndef _GAMECOMMAND_H_
 #define _GAMECOMMAND_H_
 
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 
 #include "Actor/Player.h"
 #include "Forwards.h"

src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp

@@ -1,14 +1,14 @@
 #include <boost/lexical_cast.hpp>
 
-#include <Server_Common/Common.h>
-#include <Server_Common/Version.h>
-#include <Server_Common/Network/GamePacketNew.h>
-#include <Server_Common/Network/CommonNetwork.h>
-#include <Server_Common/Util/UtilMath.h>
-#include <Server_Common/Network/PacketContainer.h>
-#include <Server_Common/Logging/Logger.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Database/DatabaseDef.h>
+#include <common/Common.h>
+#include <common/Version.h>
+#include <common/Network/GamePacketNew.h>
+#include <common/Network/CommonNetwork.h>
+#include <common/Util/UtilMath.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Logging/Logger.h>
+#include <common/Exd/ExdData.h>
+#include <common/Database/DatabaseDef.h>
 
 #include "DebugCommand.h"
 #include "DebugCommandHandler.h"

src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h

@@ -4,7 +4,7 @@
 #include <map>
 
 #include "DebugCommand.h"
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 #include "Forwards.h"
 
 namespace Core {

src/servers/Server_Zone/Event/EventHelper.cpp

@@ -1,7 +1,7 @@
 #include "EventHelper.h"
 #include "Event.h"
-#include <Server_Common/Common.h>
-#include <Server_Common/Exd/ExdData.h>
+#include <common/Common.h>
+#include <common/Exd/ExdData.h>
 
 extern Core::Data::ExdData g_exdData;
 

src/servers/Server_Zone/Inventory/Inventory.cpp

@@ -1,7 +1,8 @@
-#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <Server_Common/Common.h>
-#include <Server_Common/Exd/ExdData.h>
-#include <Server_Common/Logging/Logger.h>
+#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <common/Common.h>
+#include <common/Exd/ExdData.h>
+#include <common/Logging/Logger.h>
+#include <common/Database/DatabaseDef.h>
 
 #include "Inventory.h"
 
@@ -18,7 +19,6 @@
 #include "../Forwards.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 
-#include <Server_Common/Database/DatabaseDef.h>
 
 extern Core::Logger g_log;
 extern Core::Data::ExdData g_exdData;

src/servers/Server_Zone/Inventory/Inventory.h

@@ -1,7 +1,7 @@
 #ifndef INVENTORY_H_
 #define INVENTORY_H_
 #include <map>
-#include <Server_Common/Common.h>
+#include <common/Common.h>
 #include "../Forwards.h"
 
 namespace Core