diff --git a/Champions Reborn Server.vcxproj b/Champions Reborn Server.vcxproj index 5253e0c..9f5fefa 100644 --- a/Champions Reborn Server.vcxproj +++ b/Champions Reborn Server.vcxproj @@ -30,26 +30,26 @@ Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode @@ -81,7 +81,7 @@ true .\bin\ - Server_64 + Server_64_dbg true $(SolutionDir)obj\$(Configuration)\ @@ -129,7 +129,7 @@ Level3 Disabled _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - .\Dependency\sqlite\;%(AdditionalIncludeDirectories) + .\Include;.\Dependency\sqlite\;%(AdditionalIncludeDirectories) true stdcpp20 /utf-8 %(AdditionalOptions) @@ -138,7 +138,7 @@ Console ws2_32.lib;%(AdditionalDependencies) .\lib - .\bin\Server_64.exe + .\bin\Server_64_dbg.exe @@ -177,13 +177,15 @@ true true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - .\Dependency\sqlite\;%(AdditionalIncludeDirectories) + .\Include;.\Dependency\sqlite\;%(AdditionalIncludeDirectories) stdcpp20 Console true true + .\bin\Server_64.exe + ws2_32.lib;%(AdditionalDependencies) @@ -191,166 +193,166 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create Create Create @@ -358,10 +360,10 @@ - + - + diff --git a/Champions Reborn Server.vcxproj.filters b/Champions Reborn Server.vcxproj.filters index f177e99..6f10c2f 100644 --- a/Champions Reborn Server.vcxproj.filters +++ b/Champions Reborn Server.vcxproj.filters @@ -9,543 +9,545 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {0ecae2be-b6b6-4ee2-bcb2-9252f189acca} - - - {8b5e9b37-079d-4c08-99b0-c05b88543b70} - - - {d2399894-b1e4-4a31-86ac-a4fa3a1b7e76} - - - {d03ff7f7-63d1-43a7-b2cc-4b585130f545} - - - {92e2e64a-8125-49a7-8eb0-5e96f8d7d7d0} - - - {5f4b890f-79df-40dc-971a-5463a861107f} - - - {39350066-8ddc-4899-8102-5f346667aa37} - - - {3b0176b6-97aa-4e67-ab27-60626f71b573} - - - {a8fcffaa-8fc1-4dbc-a005-b5ddb78ee586} - - - {845ad25e-a3d9-42ac-826b-43ddeb655c25} - - - {d2bb2db4-f015-43f6-a014-6c5d3d620ba4} - - - {76928587-566c-4842-9fa3-1a5baec12238} - - - {a72820fb-0d67-45e0-91f3-b7d7b6b61465} - - - {48da1e06-b5a7-49cd-b264-12389d181a65} - {f3eef755-c7e8-4aa0-9b12-18defb183e51} - - {72ca5d8f-75d7-45b0-92fe-890fe17b53e8} - - - {2de5b54c-130c-46a4-a16b-ee1c841c7b48} - {9a0761e6-3beb-491a-9c4c-8e8fc3c8baf5} + + {063cb58b-e668-48a9-9c3f-fb44f71b57e6} + + + {2abd7d8e-f708-4a9a-9726-3bb582488763} + + + {1bbaf738-26ca-440a-9d0f-ce07ff2801aa} + + + {648a32e7-5066-45fe-979d-3fc1bcc71c67} + + + {d9b65336-539d-432d-a1f6-11e3cdee0a78} + + + {ac7f2fd7-6501-4861-9496-409f8739b5c0} + + + {de141e10-da1b-442f-af53-aac4823bbcb2} + + + {152e75b3-9e4f-48f9-94af-e6445bd95a2a} + + + {689703c8-2c84-4df1-ae2a-b92b97b284eb} + + + {4542ab93-2480-4511-9fd3-47c68efacf36} + + + {5d02896b-cb14-440b-a343-afb26f950a93} + + + {1942a77d-99be-4355-8be4-98b8a44699dc} + + + {c586cc40-8e55-44ed-a2cf-f8f7c9f54fed} + + + {ccf4baac-dc6b-41c5-a457-396f48d2d7ba} + + + {c71d0612-a064-46e1-9c9d-9e62b77f955d} + + + {684875a5-dd7b-47b4-b957-1505401424d9} + - + Header Files - + Header Files - + Header Files\Network - - Header Files - - - Header Files - - + Header Files\Network - + Header Files\Network - - Header Files\Lobby Server + + Header Files\Network - + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + Header Files\Game - + Header Files\Game - - Header Files\Crypto + + Header Files\Game - + + Header Files\Game + + Header Files\Discovery Server - + Header Files\Game - + Header Files\Game - + + Header Files\Lobby Server + + + Header Files\Crypto + + + Header Files\Crypto + + + Header Files\Game + + + Header Files\Game + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Network\Events + + + Header Files\Database + + + Header Files\Game + + + Header Files\Game + + + Header Files\Crypto + + + Header Files\Database + + + Header Files\Crypto + + + Header Files\Common + + + Header Files\Common + + + Header Files\Common + + Header Files\Network - + + Header Files\Common + + + Header Files\Common + + Header Files - - Header Files\Crypto + + Header Files - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Game - - - Header Files\Game - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Database - - - Header Files\Game - - - Header Files\Game - - - Header Files\Common - - - Header Files\Common - - - Header Files\Common - - - Header Files\Crypto - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Common - - - Header Files\Network\Event - - - Header Files\Common - - - Header Files\Game - - - Header Files\Game - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Common - - - Header Files\Network\Event - - - Header Files\Database - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event - - - Header Files\Network\Event + + Header Files - + Source Files - + Source Files - + Source Files - + + Source Files + + + Source Files + + Source Files\Network - + + Source Files\Network + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Network\Event + + + Source Files\Common + + Source Files\Lobby Server - + Source Files\Game - + Source Files\Game - - Source Files\Crypto + + Source Files\Game - + + Source Files\Game + + + Source Files\Game + + + Source Files\Game + + Source Files\Discovery Server - + Source Files\Game - + Source Files\Game - - Source Files + + Source Files\Game - + Source Files\Crypto - - Source Files\Network\Event + + Source Files\Crypto - - Source Files\Network\Event + + Source Files\Crypto - - Source Files\Network\Event + + Source Files\Common - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Game - - - Source Files\Game - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - + Source Files\Database Dependency\sqlite3 - - Source Files\Game - - - Source Files\Game - - - Source Files\Common - - - Source Files\Common - - - Source Files\Crypto - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Game - - - Source Files\Game - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - - Source Files\Network\Event - - + - + + Header Files + \ No newline at end of file diff --git a/Champions Server.rc b/Include/Champions Server.rc similarity index 100% rename from Champions Server.rc rename to Include/Champions Server.rc diff --git a/Common/ByteBufferReader.hpp b/Include/Common/ByteBufferReader.hpp similarity index 100% rename from Common/ByteBufferReader.hpp rename to Include/Common/ByteBufferReader.hpp diff --git a/Common/ByteStream.h b/Include/Common/ByteStream.hpp similarity index 97% rename from Common/ByteStream.h rename to Include/Common/ByteStream.hpp index 1057f8c..f0b410d 100644 --- a/Common/ByteStream.h +++ b/Include/Common/ByteStream.hpp @@ -6,8 +6,8 @@ #include #include -#include "Utility.h" -#include "../Crypto/RealmCrypt.h" +#include "Utility.hpp" +#include "../Crypto/RealmCrypt.hpp" class ByteBuffer { public: diff --git a/Common/Constant.h b/Include/Common/Constant.hpp similarity index 100% rename from Common/Constant.h rename to Include/Common/Constant.hpp diff --git a/Common/ForwardDecl.h b/Include/Common/ForwardDecl.hpp similarity index 100% rename from Common/ForwardDecl.h rename to Include/Common/ForwardDecl.hpp diff --git a/Common/RLEZ.hpp b/Include/Common/RLEZ.hpp similarity index 100% rename from Common/RLEZ.hpp rename to Include/Common/RLEZ.hpp diff --git a/Common/Utility.h b/Include/Common/Utility.hpp similarity index 100% rename from Common/Utility.h rename to Include/Common/Utility.hpp diff --git a/Crypto/PasswordHash.h b/Include/Crypto/PasswordHash.hpp similarity index 100% rename from Crypto/PasswordHash.h rename to Include/Crypto/PasswordHash.hpp diff --git a/Crypto/RealmCrypt.h b/Include/Crypto/RealmCrypt.hpp similarity index 98% rename from Crypto/RealmCrypt.h rename to Include/Crypto/RealmCrypt.hpp index 090447f..d61fb99 100644 --- a/Crypto/RealmCrypt.h +++ b/Include/Crypto/RealmCrypt.hpp @@ -4,7 +4,7 @@ #include #include -#include "rijndael.h" +#include "rijndael.hpp" // This class is based on the games Encryptor class, // and is a wrapper around the rijndael ECB implementation. diff --git a/Crypto/rijndael.h b/Include/Crypto/rijndael.hpp similarity index 100% rename from Crypto/rijndael.h rename to Include/Crypto/rijndael.hpp diff --git a/Database/Database.h b/Include/Database/Database.hpp similarity index 91% rename from Database/Database.h rename to Include/Database/Database.hpp index c2579e5..25f3de6 100644 --- a/Database/Database.h +++ b/Include/Database/Database.hpp @@ -8,9 +8,9 @@ #include #include -#include "Transaction.h" -#include "../../Game/RealmCharacter.h" -#include "../../Game/RealmCharacterMetaKV.h" +#include "Transaction.hpp" +#include "Game/RealmCharacter.hpp" +#include "Game/RealmCharacterMetaKV.hpp" enum class QueryID { CreateAccount, @@ -35,7 +35,6 @@ class Database { private: static inline std::unique_ptr m_instance; static inline std::mutex m_mutex; - static inline std::chrono::time_point< std::chrono::steady_clock > m_lastMaintenance; sqlite3 *m_db = nullptr; std::unordered_map< QueryID, sqlite3_stmt * > m_statements; @@ -55,8 +54,6 @@ public: Database(); ~Database(); - void Process(); - public: int64_t CreateNewAccount( const std::string &username, const std::string &password, diff --git a/Database/Transaction.h b/Include/Database/Transaction.hpp similarity index 100% rename from Database/Transaction.h rename to Include/Database/Transaction.hpp diff --git a/Discovery Server/DiscoveryServer.h b/Include/Discovery Server/DiscoveryServer.hpp similarity index 95% rename from Discovery Server/DiscoveryServer.h rename to Include/Discovery Server/DiscoveryServer.hpp index 95d4436..6afc08c 100644 --- a/Discovery Server/DiscoveryServer.h +++ b/Include/Discovery Server/DiscoveryServer.hpp @@ -9,7 +9,7 @@ #include #include -#include "../Common/ByteStream.h" +#include "Common/ByteStream.hpp" class DiscoveryServer { public: diff --git a/Game/CharacterSaveManager.h b/Include/Game/CharacterSaveManager.hpp similarity index 97% rename from Game/CharacterSaveManager.h rename to Include/Game/CharacterSaveManager.hpp index 474aed6..11053bd 100644 --- a/Game/CharacterSaveManager.h +++ b/Include/Game/CharacterSaveManager.hpp @@ -4,7 +4,7 @@ #include #include -#include "CharacterSaveTask.h" +#include "CharacterSaveTask.hpp" class CharacterSaveManager { public: diff --git a/Game/CharacterSaveTask.h b/Include/Game/CharacterSaveTask.hpp similarity index 86% rename from Game/CharacterSaveTask.h rename to Include/Game/CharacterSaveTask.hpp index 926bdfa..78fbc97 100644 --- a/Game/CharacterSaveTask.h +++ b/Include/Game/CharacterSaveTask.hpp @@ -5,10 +5,10 @@ #include #include -#include "../Common/Constant.h" -#include "../Common/ByteStream.h" -#include "RealmUser.h" -#include "RealmCharacterMetaKV.h" +#include "Common/Constant.hpp" +#include "Common/ByteStream.hpp" +#include "RealmUser.hpp" +#include "RealmCharacterMetaKV.hpp" enum class CharacterSaveType : uint8_t { diff --git a/Game/ChatRoomManager.h b/Include/Game/ChatRoomManager.hpp similarity index 97% rename from Game/ChatRoomManager.h rename to Include/Game/ChatRoomManager.hpp index e67ad74..66b393d 100644 --- a/Game/ChatRoomManager.h +++ b/Include/Game/ChatRoomManager.hpp @@ -5,7 +5,7 @@ #include #include -#include "ChatRoomSession.h" +#include "ChatRoomSession.hpp" class ChatRoomManager { private: diff --git a/Game/ChatRoomSession.h b/Include/Game/ChatRoomSession.hpp similarity index 96% rename from Game/ChatRoomSession.h rename to Include/Game/ChatRoomSession.hpp index 57c4fab..164c7f0 100644 --- a/Game/ChatRoomSession.h +++ b/Include/Game/ChatRoomSession.hpp @@ -4,7 +4,7 @@ #include #include -#include "RealmUser.h" +#include "RealmUser.hpp" class ChatRoomSession { public: diff --git a/Game/GameSession.h b/Include/Game/GameSession.hpp similarity index 97% rename from Game/GameSession.h rename to Include/Game/GameSession.hpp index 671432e..21b8d1c 100644 --- a/Game/GameSession.h +++ b/Include/Game/GameSession.hpp @@ -5,7 +5,7 @@ #include #include -#include "RealmUser.h" +#include "RealmUser.hpp" class GameSession { public: diff --git a/Game/GameSessionManager.h b/Include/Game/GameSessionManager.hpp similarity index 97% rename from Game/GameSessionManager.h rename to Include/Game/GameSessionManager.hpp index a4e09f8..144f2ad 100644 --- a/Game/GameSessionManager.h +++ b/Include/Game/GameSessionManager.hpp @@ -4,9 +4,9 @@ #include #include -#include "GameSession.h" +#include "GameSession.hpp" -#include "../Common/Constant.h" +#include "Common/Constant.hpp" class GameSessionManager { private: diff --git a/Game/RealmCharacter.h b/Include/Game/RealmCharacter.hpp similarity index 97% rename from Game/RealmCharacter.h rename to Include/Game/RealmCharacter.hpp index 4ef7fb4..dfff4e2 100644 --- a/Game/RealmCharacter.h +++ b/Include/Game/RealmCharacter.hpp @@ -5,9 +5,9 @@ #include #include -#include "../Common/Constant.h" -#include "../Common/ByteStream.h" -#include "RealmCharacterMetaKV.h" +#include "Common/Constant.hpp" +#include "Common/ByteStream.hpp" +#include "RealmCharacterMetaKV.hpp" constexpr size_t MAX_NUMBER_OF_CHARACTERS = 12; constexpr size_t CHARACTER_DATA_SIZE = 19504; diff --git a/Game/RealmCharacterMetaKV.h b/Include/Game/RealmCharacterMetaKV.hpp similarity index 96% rename from Game/RealmCharacterMetaKV.h rename to Include/Game/RealmCharacterMetaKV.hpp index bb2635d..52a365f 100644 --- a/Game/RealmCharacterMetaKV.h +++ b/Include/Game/RealmCharacterMetaKV.hpp @@ -4,7 +4,7 @@ #include #include -#include "../Common/ByteStream.h" +#include "Common/ByteStream.hpp" using CharacterAttributeKV = std::pair; diff --git a/Game/RealmUser.h b/Include/Game/RealmUser.hpp similarity index 95% rename from Game/RealmUser.h rename to Include/Game/RealmUser.hpp index a7fc75b..d7d44b5 100644 --- a/Game/RealmUser.h +++ b/Include/Game/RealmUser.hpp @@ -4,10 +4,10 @@ #include #include -#include "RealmCharacter.h" +#include "RealmCharacter.hpp" -#include "../Common/Constant.h" -#include "../Network/RealmSocket.h" +#include "Common/Constant.hpp" +#include "../Network/RealmSocket.hpp" class RealmUser { public: diff --git a/Game/RealmUserManager.h b/Include/Game/RealmUserManager.hpp similarity index 97% rename from Game/RealmUserManager.h rename to Include/Game/RealmUserManager.hpp index 69216c2..25a9ea5 100644 --- a/Game/RealmUserManager.h +++ b/Include/Game/RealmUserManager.hpp @@ -6,7 +6,7 @@ #include #include -#include "RealmUser.h" +#include "RealmUser.hpp" class UserManager { private: diff --git a/Lobby Server/LobbyServer.h b/Include/Lobby Server/LobbyServer.hpp similarity index 91% rename from Lobby Server/LobbyServer.h rename to Include/Lobby Server/LobbyServer.hpp index 6e02669..96f6fcd 100644 --- a/Lobby Server/LobbyServer.h +++ b/Include/Lobby Server/LobbyServer.hpp @@ -11,9 +11,9 @@ #include #include -#include "../Common/Constant.h" -#include "../Common/ByteStream.h" -#include "../Network/RealmSocket.h" +#include "Common/Constant.hpp" +#include "Common/ByteStream.hpp" +#include "../Network/RealmSocket.hpp" class LobbyServer { diff --git a/Network/Event/NotifyClientDiscovered.h b/Include/Network/Event/NotifyClientDiscovered.hpp similarity index 77% rename from Network/Event/NotifyClientDiscovered.h rename to Include/Network/Event/NotifyClientDiscovered.hpp index 77cc7a9..65e157e 100644 --- a/Network/Event/NotifyClientDiscovered.h +++ b/Include/Network/Event/NotifyClientDiscovered.hpp @@ -2,8 +2,8 @@ #include -#include "../GenericNetMessage.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetMessage.hpp" +#include "Common/ForwardDecl.hpp" class NotifyClientDiscovered : public GenericMessage { private: diff --git a/Network/Event/NotifyClientDiscovered_RTA.h b/Include/Network/Event/NotifyClientDiscovered_RTA.hpp similarity index 70% rename from Network/Event/NotifyClientDiscovered_RTA.h rename to Include/Network/Event/NotifyClientDiscovered_RTA.hpp index e0cff61..4d04f5a 100644 --- a/Network/Event/NotifyClientDiscovered_RTA.h +++ b/Include/Network/Event/NotifyClientDiscovered_RTA.hpp @@ -2,9 +2,9 @@ #include -#include "../GenericNetMessage.h" -#include "../../Common/Constant.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetMessage.hpp" +#include "Common/Constant.hpp" +#include "Common/ForwardDecl.hpp" class NotifyClientDiscovered_RTA : public GenericMessage { private: diff --git a/Network/Event/NotifyClientReqConnect.h b/Include/Network/Event/NotifyClientReqConnect.h similarity index 100% rename from Network/Event/NotifyClientReqConnect.h rename to Include/Network/Event/NotifyClientReqConnect.h diff --git a/Network/Event/NotifyClientRequestConnect.h b/Include/Network/Event/NotifyClientRequestConnect.hpp similarity index 78% rename from Network/Event/NotifyClientRequestConnect.h rename to Include/Network/Event/NotifyClientRequestConnect.hpp index 0d0d8b4..f3327a6 100644 --- a/Network/Event/NotifyClientRequestConnect.h +++ b/Include/Network/Event/NotifyClientRequestConnect.hpp @@ -2,8 +2,8 @@ #include -#include "../GenericNetMessage.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetMessage.hpp" +#include "Common/ForwardDecl.hpp" class NotifyClientRequestConnect : public GenericMessage { private: diff --git a/Network/Event/NotifyClientRequestConnect_RTA.h b/Include/Network/Event/NotifyClientRequestConnect_RTA.hpp similarity index 82% rename from Network/Event/NotifyClientRequestConnect_RTA.h rename to Include/Network/Event/NotifyClientRequestConnect_RTA.hpp index 3537031..42d9b24 100644 --- a/Network/Event/NotifyClientRequestConnect_RTA.h +++ b/Include/Network/Event/NotifyClientRequestConnect_RTA.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetMessage.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetMessage.hpp" +#include "Common/ForwardDecl.hpp" class NotifyClientRequestConnect_RTA : public GenericMessage { private: diff --git a/Network/Event/NotifyForcedLogout.h b/Include/Network/Event/NotifyForcedLogout.hpp similarity index 81% rename from Network/Event/NotifyForcedLogout.h rename to Include/Network/Event/NotifyForcedLogout.hpp index be0f916..860b329 100644 --- a/Network/Event/NotifyForcedLogout.h +++ b/Include/Network/Event/NotifyForcedLogout.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../GenericNetMessage.h" +#include "../GenericNetMessage.hpp" class NotifyForcedLogout : public GenericMessage { private: diff --git a/Network/Event/NotifyFriendStatus.h b/Include/Network/Event/NotifyFriendStatus.hpp similarity index 86% rename from Network/Event/NotifyFriendStatus.h rename to Include/Network/Event/NotifyFriendStatus.hpp index d95175f..3dfbf72 100644 --- a/Network/Event/NotifyFriendStatus.h +++ b/Include/Network/Event/NotifyFriendStatus.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../GenericNetMessage.h" +#include "../GenericNetMessage.hpp" class NotifyFriendStatus : public GenericMessage { private: diff --git a/Network/Event/NotifyGameDiscovered.h b/Include/Network/Event/NotifyGameDiscovered.hpp similarity index 73% rename from Network/Event/NotifyGameDiscovered.h rename to Include/Network/Event/NotifyGameDiscovered.hpp index 5d3ae4e..eb956f1 100644 --- a/Network/Event/NotifyGameDiscovered.h +++ b/Include/Network/Event/NotifyGameDiscovered.hpp @@ -3,9 +3,9 @@ #include #include -#include "../GenericNetMessage.h" -#include "../../Common/Constant.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetMessage.hpp" +#include "Common/Constant.hpp" +#include "Common/ForwardDecl.hpp" class NotifyGameDiscovered : public GenericMessage { private: diff --git a/Network/Event/NotifyInstantMessage.h b/Include/Network/Event/NotifyInstantMessage.hpp similarity index 87% rename from Network/Event/NotifyInstantMessage.h rename to Include/Network/Event/NotifyInstantMessage.hpp index 0d486d7..ce4888a 100644 --- a/Network/Event/NotifyInstantMessage.h +++ b/Include/Network/Event/NotifyInstantMessage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../GenericNetMessage.h" +#include "../GenericNetMessage.hpp" class NotifyInstantMessage : public GenericMessage { private: diff --git a/Include/Network/Event/NotifyReserveUserSlot_RTA.h b/Include/Network/Event/NotifyReserveUserSlot_RTA.h new file mode 100644 index 0000000..143ac8c --- /dev/null +++ b/Include/Network/Event/NotifyReserveUserSlot_RTA.h @@ -0,0 +1,14 @@ +#pragma once + +#include "../GenericNetMessage.h" + +class NotifyReserveUserSlot_RTA : public GenericMessage { +private: + std::string m_discoveryAddr; + int32_t m_port; + int32_t m_memberId; + +public: + NotifyReserveUserSlot_RTA( int32_t memberId, std::string discoveryAddr, int32_t discoveryPort ); + void Serialize(ByteBuffer &out) const override; +}; \ No newline at end of file diff --git a/Network/Event/NotifyRoomMessage.h b/Include/Network/Event/NotifyRoomMessage.hpp similarity index 89% rename from Network/Event/NotifyRoomMessage.h rename to Include/Network/Event/NotifyRoomMessage.hpp index f5c98f9..2cd4908 100644 --- a/Network/Event/NotifyRoomMessage.h +++ b/Include/Network/Event/NotifyRoomMessage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../GenericNetMessage.h" +#include "../GenericNetMessage.hpp" class NotifyRoomMessage : public GenericMessage { private: diff --git a/Include/Network/Event/Notify_4C.h b/Include/Network/Event/Notify_4C.h new file mode 100644 index 0000000..dfac88b --- /dev/null +++ b/Include/Network/Event/Notify_4C.h @@ -0,0 +1,11 @@ +#pragma once + +#include "../GenericNetMessage.h" + +class Notify_4C : public GenericMessage { +private: + +public: + Notify_4C(); + void Serialize(ByteBuffer &out) const override; +}; \ No newline at end of file diff --git a/Include/Network/Event/Notify_65.h b/Include/Network/Event/Notify_65.h new file mode 100644 index 0000000..6ca3d3e --- /dev/null +++ b/Include/Network/Event/Notify_65.h @@ -0,0 +1,14 @@ +#pragma once + +#include "../GenericNetMessage.h" + +class NotifyClientRequestsConnect2 : public GenericMessage { +private: + std::string m_discoveryAddr; + std::string m_localAddr; + int32_t m_port; + +public: + NotifyClientRequestsConnect2( std::string discoveryAddr, std::string localAddr, int32_t port ); + ByteBuffer &Serialize() override; +}; \ No newline at end of file diff --git a/Network/Event/RequestAddFriend.h b/Include/Network/Event/RequestAddFriend.hpp similarity index 91% rename from Network/Event/RequestAddFriend.h rename to Include/Network/Event/RequestAddFriend.hpp index e0f349a..69651ed 100644 --- a/Network/Event/RequestAddFriend.h +++ b/Include/Network/Event/RequestAddFriend.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestAddFriend : public GenericRequest { diff --git a/Network/Event/RequestAddIgnore.h b/Include/Network/Event/RequestAddIgnore.hpp similarity index 91% rename from Network/Event/RequestAddIgnore.h rename to Include/Network/Event/RequestAddIgnore.hpp index 362db3d..f6eee79 100644 --- a/Network/Event/RequestAddIgnore.h +++ b/Include/Network/Event/RequestAddIgnore.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestAddIgnore : public GenericRequest { diff --git a/Network/Event/RequestAppendCharacterData.h b/Include/Network/Event/RequestAppendCharacterData.hpp similarity index 91% rename from Network/Event/RequestAppendCharacterData.h rename to Include/Network/Event/RequestAppendCharacterData.hpp index cfc42a3..0667237 100644 --- a/Network/Event/RequestAppendCharacterData.h +++ b/Include/Network/Event/RequestAppendCharacterData.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestAppendCharacterData : public GenericRequest { diff --git a/Network/Event/RequestCancelGame.h b/Include/Network/Event/RequestCancelGame.hpp similarity index 88% rename from Network/Event/RequestCancelGame.h rename to Include/Network/Event/RequestCancelGame.hpp index 8c52a1a..2a6d6d3 100644 --- a/Network/Event/RequestCancelGame.h +++ b/Include/Network/Event/RequestCancelGame.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCancelGame : public GenericRequest { diff --git a/Network/Event/RequestCancelGame_RTA.h b/Include/Network/Event/RequestCancelGame_RTA.hpp similarity index 88% rename from Network/Event/RequestCancelGame_RTA.h rename to Include/Network/Event/RequestCancelGame_RTA.hpp index 2d79408..cae5edc 100644 --- a/Network/Event/RequestCancelGame_RTA.h +++ b/Include/Network/Event/RequestCancelGame_RTA.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCancelGame_RTA : public GenericRequest { diff --git a/Network/Event/RequestCreateAccount.h b/Include/Network/Event/RequestCreateAccount.hpp similarity index 92% rename from Network/Event/RequestCreateAccount.h rename to Include/Network/Event/RequestCreateAccount.hpp index c02f965..4e32e25 100644 --- a/Network/Event/RequestCreateAccount.h +++ b/Include/Network/Event/RequestCreateAccount.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCreateAccount : public GenericRequest { diff --git a/Network/Event/RequestCreateNewCharacter_RTA.h b/Include/Network/Event/RequestCreateNewCharacter_RTA.hpp similarity index 87% rename from Network/Event/RequestCreateNewCharacter_RTA.h rename to Include/Network/Event/RequestCreateNewCharacter_RTA.hpp index ddf89de..148a994 100644 --- a/Network/Event/RequestCreateNewCharacter_RTA.h +++ b/Include/Network/Event/RequestCreateNewCharacter_RTA.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/RealmCharacter.h" +#include "Game/RealmCharacter.hpp" class RequestCreateNewCharacter_RTA : public GenericRequest { diff --git a/Network/Event/RequestCreatePrivateGame.h b/Include/Network/Event/RequestCreatePrivateGame.hpp similarity index 92% rename from Network/Event/RequestCreatePrivateGame.h rename to Include/Network/Event/RequestCreatePrivateGame.hpp index dd164ad..57a8cae 100644 --- a/Network/Event/RequestCreatePrivateGame.h +++ b/Include/Network/Event/RequestCreatePrivateGame.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCreatePrivateGame : public GenericRequest { diff --git a/Network/Event/RequestCreatePrivateGame_RTA.h b/Include/Network/Event/RequestCreatePrivateGame_RTA.hpp similarity index 93% rename from Network/Event/RequestCreatePrivateGame_RTA.h rename to Include/Network/Event/RequestCreatePrivateGame_RTA.hpp index c91df32..10f59c4 100644 --- a/Network/Event/RequestCreatePrivateGame_RTA.h +++ b/Include/Network/Event/RequestCreatePrivateGame_RTA.hpp @@ -4,8 +4,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCreatePrivateGame_RTA : public GenericRequest { diff --git a/Network/Event/RequestCreatePrivateRoom.h b/Include/Network/Event/RequestCreatePrivateRoom.hpp similarity index 89% rename from Network/Event/RequestCreatePrivateRoom.h rename to Include/Network/Event/RequestCreatePrivateRoom.hpp index bd80a11..0e7559d 100644 --- a/Network/Event/RequestCreatePrivateRoom.h +++ b/Include/Network/Event/RequestCreatePrivateRoom.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCreatePrivateRoom : public GenericRequest { diff --git a/Network/Event/RequestCreatePublicGame.h b/Include/Network/Event/RequestCreatePublicGame.hpp similarity index 93% rename from Network/Event/RequestCreatePublicGame.h rename to Include/Network/Event/RequestCreatePublicGame.hpp index ec86928..c3daad0 100644 --- a/Network/Event/RequestCreatePublicGame.h +++ b/Include/Network/Event/RequestCreatePublicGame.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCreatePublicGame : public GenericRequest { diff --git a/Network/Event/RequestCreatePublicGame_RTA.h b/Include/Network/Event/RequestCreatePublicGame_RTA.hpp similarity index 93% rename from Network/Event/RequestCreatePublicGame_RTA.h rename to Include/Network/Event/RequestCreatePublicGame_RTA.hpp index 7dfff74..5c382c9 100644 --- a/Network/Event/RequestCreatePublicGame_RTA.h +++ b/Include/Network/Event/RequestCreatePublicGame_RTA.hpp @@ -4,8 +4,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestCreatePublicGame_RTA : public GenericRequest { diff --git a/Network/Event/RequestDoClientDiscovery.h b/Include/Network/Event/RequestDoClientDiscovery.hpp similarity index 91% rename from Network/Event/RequestDoClientDiscovery.h rename to Include/Network/Event/RequestDoClientDiscovery.hpp index 10aaf31..7186d80 100644 --- a/Network/Event/RequestDoClientDiscovery.h +++ b/Include/Network/Event/RequestDoClientDiscovery.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestDoClientDiscovery : public GenericRequest { diff --git a/Network/Event/RequestDoClientDiscovery_RTA.h b/Include/Network/Event/RequestDoClientDiscovery_RTA.hpp similarity index 92% rename from Network/Event/RequestDoClientDiscovery_RTA.h rename to Include/Network/Event/RequestDoClientDiscovery_RTA.hpp index d6d7e03..b0b7417 100644 --- a/Network/Event/RequestDoClientDiscovery_RTA.h +++ b/Include/Network/Event/RequestDoClientDiscovery_RTA.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestDoClientDiscovery_RTA : public GenericRequest { private: diff --git a/Network/Event/RequestEnterRoom.h b/Include/Network/Event/RequestEnterRoom.hpp similarity index 86% rename from Network/Event/RequestEnterRoom.h rename to Include/Network/Event/RequestEnterRoom.hpp index 6a0ed9c..5bc2eb0 100644 --- a/Network/Event/RequestEnterRoom.h +++ b/Include/Network/Event/RequestEnterRoom.hpp @@ -3,10 +3,10 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/ChatRoomSession.h" +#include "Game/ChatRoomSession.hpp" class RequestEnterRoom : public GenericRequest { diff --git a/Network/Event/RequestGetCharacterData_RTA.h b/Include/Network/Event/RequestGetCharacterData_RTA.hpp similarity index 90% rename from Network/Event/RequestGetCharacterData_RTA.h rename to Include/Network/Event/RequestGetCharacterData_RTA.hpp index a5f583e..0115b69 100644 --- a/Network/Event/RequestGetCharacterData_RTA.h +++ b/Include/Network/Event/RequestGetCharacterData_RTA.hpp @@ -3,10 +3,10 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/RealmCharacter.h" +#include "Game/RealmCharacter.hpp" class RequestGetNetCharacterData_RTA : public GenericRequest { diff --git a/Network/Event/RequestGetEncryptionKey.h b/Include/Network/Event/RequestGetEncryptionKey.hpp similarity index 88% rename from Network/Event/RequestGetEncryptionKey.h rename to Include/Network/Event/RequestGetEncryptionKey.hpp index efcdc5c..9b14659 100644 --- a/Network/Event/RequestGetEncryptionKey.h +++ b/Include/Network/Event/RequestGetEncryptionKey.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestGetEncryptionKey : public GenericRequest { diff --git a/Include/Network/Event/RequestGetFriendList.h b/Include/Network/Event/RequestGetFriendList.h new file mode 100644 index 0000000..255e300 --- /dev/null +++ b/Include/Network/Event/RequestGetFriendList.h @@ -0,0 +1,25 @@ +#pragma once + +#include +#include + +#include "../GenericNetRequest.h" +#include "../GenericNetResponse.h" + +class RequestGetFriendList : public GenericRequest +{ +public: + static std::unique_ptr< RequestGetFriendList > Create() + { + return std::make_unique< RequestGetFriendList >(); + } + + sptr_generic_response ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) override; + void Deserialize( sptr_byte_stream stream ) override; +}; + +class ResultGetFriendList : public GenericResponse { +public: + ResultGetFriendList( GenericRequest *request ); + void Serialize( ByteBuffer &out ) const; +}; \ No newline at end of file diff --git a/Network/Event/RequestGetGame.h b/Include/Network/Event/RequestGetGame.hpp similarity index 90% rename from Network/Event/RequestGetGame.h rename to Include/Network/Event/RequestGetGame.hpp index cbe9017..034b401 100644 --- a/Network/Event/RequestGetGame.h +++ b/Include/Network/Event/RequestGetGame.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestGetGame : public GenericRequest { private: diff --git a/Network/Event/RequestGetGame_RTA.h b/Include/Network/Event/RequestGetGame_RTA.hpp similarity index 92% rename from Network/Event/RequestGetGame_RTA.h rename to Include/Network/Event/RequestGetGame_RTA.hpp index 55d3626..093bbd0 100644 --- a/Network/Event/RequestGetGame_RTA.h +++ b/Include/Network/Event/RequestGetGame_RTA.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestGetGame_RTA : public GenericRequest { private: diff --git a/Network/Event/RequestGetNetCharacterList_RTA.h b/Include/Network/Event/RequestGetNetCharacterList_RTA.hpp similarity index 88% rename from Network/Event/RequestGetNetCharacterList_RTA.h rename to Include/Network/Event/RequestGetNetCharacterList_RTA.hpp index ae24881..d718b56 100644 --- a/Network/Event/RequestGetNetCharacterList_RTA.h +++ b/Include/Network/Event/RequestGetNetCharacterList_RTA.hpp @@ -5,9 +5,9 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" -#include "../../Game/RealmCharacterMetaKV.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" +#include "Game/RealmCharacterMetaKV.hpp" class RequestGetNetCharacterList_RTA : public GenericRequest { diff --git a/Network/Event/RequestGetPublicRooms.h b/Include/Network/Event/RequestGetPublicRooms.hpp similarity index 85% rename from Network/Event/RequestGetPublicRooms.h rename to Include/Network/Event/RequestGetPublicRooms.hpp index efc5055..8f14d5f 100644 --- a/Network/Event/RequestGetPublicRooms.h +++ b/Include/Network/Event/RequestGetPublicRooms.hpp @@ -3,10 +3,10 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/ChatRoomSession.h" +#include "Game/ChatRoomSession.hpp" class RequestGetPublicRooms : public GenericRequest { diff --git a/Network/Event/RequestGetRealmStats.h b/Include/Network/Event/RequestGetRealmStats.hpp similarity index 88% rename from Network/Event/RequestGetRealmStats.h rename to Include/Network/Event/RequestGetRealmStats.hpp index b337be6..918b06a 100644 --- a/Network/Event/RequestGetRealmStats.h +++ b/Include/Network/Event/RequestGetRealmStats.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestGetRealmStats : public GenericRequest { diff --git a/Network/Event/RequestGetRoom.h b/Include/Network/Event/RequestGetRoom.hpp similarity index 87% rename from Network/Event/RequestGetRoom.h rename to Include/Network/Event/RequestGetRoom.hpp index 31e1a21..543ad6d 100644 --- a/Network/Event/RequestGetRoom.h +++ b/Include/Network/Event/RequestGetRoom.hpp @@ -3,10 +3,10 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/ChatRoomSession.h" +#include "Game/ChatRoomSession.hpp" class RequestGetRoom : public GenericRequest { private: diff --git a/Network/Event/RequestGetRules.h b/Include/Network/Event/RequestGetRules.hpp similarity index 89% rename from Network/Event/RequestGetRules.h rename to Include/Network/Event/RequestGetRules.hpp index d22ad5b..60729d2 100644 --- a/Network/Event/RequestGetRules.h +++ b/Include/Network/Event/RequestGetRules.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestGetRules : public GenericRequest { diff --git a/Network/Event/RequestGetServerAddress.h b/Include/Network/Event/RequestGetServerAddress.hpp similarity index 86% rename from Network/Event/RequestGetServerAddress.h rename to Include/Network/Event/RequestGetServerAddress.hpp index 7dd1908..df93353 100644 --- a/Network/Event/RequestGetServerAddress.h +++ b/Include/Network/Event/RequestGetServerAddress.hpp @@ -3,9 +3,9 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" -#include "../../Common/Constant.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" +#include "Common/Constant.hpp" class RequestGetServerAddress : public GenericRequest { public: diff --git a/Network/Event/RequestGetSocialListInitial.h b/Include/Network/Event/RequestGetSocialListInitial.hpp similarity index 85% rename from Network/Event/RequestGetSocialListInitial.h rename to Include/Network/Event/RequestGetSocialListInitial.hpp index a3310e1..473a7f3 100644 --- a/Network/Event/RequestGetSocialListInitial.h +++ b/Include/Network/Event/RequestGetSocialListInitial.hpp @@ -3,9 +3,9 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" +#include "Common/ForwardDecl.hpp" class RequestGetSocialListInitial : public GenericRequest { diff --git a/Network/Event/RequestGetSocialListUpdate.h b/Include/Network/Event/RequestGetSocialListUpdate.hpp similarity index 85% rename from Network/Event/RequestGetSocialListUpdate.h rename to Include/Network/Event/RequestGetSocialListUpdate.hpp index e97054e..a598df2 100644 --- a/Network/Event/RequestGetSocialListUpdate.h +++ b/Include/Network/Event/RequestGetSocialListUpdate.hpp @@ -3,9 +3,9 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" -#include "../../Common/ForwardDecl.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" +#include "Common/ForwardDecl.hpp" class RequestGetSocialListUpdate : public GenericRequest { diff --git a/Network/Event/RequestLeaveRoom.h b/Include/Network/Event/RequestLeaveRoom.hpp similarity index 89% rename from Network/Event/RequestLeaveRoom.h rename to Include/Network/Event/RequestLeaveRoom.hpp index d75a376..56254ae 100644 --- a/Network/Event/RequestLeaveRoom.h +++ b/Include/Network/Event/RequestLeaveRoom.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestLeaveRoom : public GenericRequest { diff --git a/Network/Event/RequestLogin.h b/Include/Network/Event/RequestLogin.hpp similarity index 92% rename from Network/Event/RequestLogin.h rename to Include/Network/Event/RequestLogin.hpp index f936a16..05d2b53 100644 --- a/Network/Event/RequestLogin.h +++ b/Include/Network/Event/RequestLogin.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestLogin : public GenericRequest { diff --git a/Network/Event/RequestLogout.h b/Include/Network/Event/RequestLogout.hpp similarity index 88% rename from Network/Event/RequestLogout.h rename to Include/Network/Event/RequestLogout.hpp index 9ee99c9..e9118fa 100644 --- a/Network/Event/RequestLogout.h +++ b/Include/Network/Event/RequestLogout.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestLogout : public GenericRequest { diff --git a/Network/Event/RequestMatchGame.h b/Include/Network/Event/RequestMatchGame.hpp similarity index 88% rename from Network/Event/RequestMatchGame.h rename to Include/Network/Event/RequestMatchGame.hpp index 2fa1b8a..05fbe68 100644 --- a/Network/Event/RequestMatchGame.h +++ b/Include/Network/Event/RequestMatchGame.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestMatchGame : public GenericRequest { diff --git a/Network/Event/RequestMatchGame_RTA.h b/Include/Network/Event/RequestMatchGame_RTA.hpp similarity index 89% rename from Network/Event/RequestMatchGame_RTA.h rename to Include/Network/Event/RequestMatchGame_RTA.hpp index 503834a..f20f225 100644 --- a/Network/Event/RequestMatchGame_RTA.h +++ b/Include/Network/Event/RequestMatchGame_RTA.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestMatchGame_RTA : public GenericRequest { diff --git a/Network/Event/RequestRemoveFriend.h b/Include/Network/Event/RequestRemoveFriend.hpp similarity index 91% rename from Network/Event/RequestRemoveFriend.h rename to Include/Network/Event/RequestRemoveFriend.hpp index 54938a1..c980622 100644 --- a/Network/Event/RequestRemoveFriend.h +++ b/Include/Network/Event/RequestRemoveFriend.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestRemoveFriend : public GenericRequest { diff --git a/Network/Event/RequestRemoveIgnore.h b/Include/Network/Event/RequestRemoveIgnore.hpp similarity index 91% rename from Network/Event/RequestRemoveIgnore.h rename to Include/Network/Event/RequestRemoveIgnore.hpp index fd12e54..b1db60c 100644 --- a/Network/Event/RequestRemoveIgnore.h +++ b/Include/Network/Event/RequestRemoveIgnore.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestRemoveIgnore : public GenericRequest { diff --git a/Network/Event/RequestSaveCharacter_RTA.h b/Include/Network/Event/RequestSaveCharacter_RTA.hpp similarity index 88% rename from Network/Event/RequestSaveCharacter_RTA.h rename to Include/Network/Event/RequestSaveCharacter_RTA.hpp index 4242536..4fdc798 100644 --- a/Network/Event/RequestSaveCharacter_RTA.h +++ b/Include/Network/Event/RequestSaveCharacter_RTA.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/RealmCharacter.h" +#include "Game/RealmCharacter.hpp" class RequestSaveCharacter_RTA : public GenericRequest { diff --git a/Network/Event/RequestSendInstantMessage.h b/Include/Network/Event/RequestSendInstantMessage.hpp similarity index 91% rename from Network/Event/RequestSendInstantMessage.h rename to Include/Network/Event/RequestSendInstantMessage.hpp index 801cddf..6bb747a 100644 --- a/Network/Event/RequestSendInstantMessage.h +++ b/Include/Network/Event/RequestSendInstantMessage.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestSendInstantMessage : public GenericRequest { diff --git a/Network/Event/RequestSendRoomMessage.h b/Include/Network/Event/RequestSendRoomMessage.hpp similarity index 90% rename from Network/Event/RequestSendRoomMessage.h rename to Include/Network/Event/RequestSendRoomMessage.hpp index 146dd4a..03f1e18 100644 --- a/Network/Event/RequestSendRoomMessage.h +++ b/Include/Network/Event/RequestSendRoomMessage.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestSendRoomMessage : public GenericRequest { diff --git a/Network/Event/RequestStartGame.h b/Include/Network/Event/RequestStartGame.hpp similarity index 90% rename from Network/Event/RequestStartGame.h rename to Include/Network/Event/RequestStartGame.hpp index 04de32f..ca2e14c 100644 --- a/Network/Event/RequestStartGame.h +++ b/Include/Network/Event/RequestStartGame.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestStartGame : public GenericRequest { diff --git a/Network/Event/RequestTouchSession.h b/Include/Network/Event/RequestTouchSession.hpp similarity index 88% rename from Network/Event/RequestTouchSession.h rename to Include/Network/Event/RequestTouchSession.hpp index 45a3f65..3684821 100644 --- a/Network/Event/RequestTouchSession.h +++ b/Include/Network/Event/RequestTouchSession.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestTouchSession : public GenericRequest { diff --git a/Network/Event/RequestUpdateGameData.h b/Include/Network/Event/RequestUpdateGameData.hpp similarity index 86% rename from Network/Event/RequestUpdateGameData.h rename to Include/Network/Event/RequestUpdateGameData.hpp index 8ba7986..8a1e739 100644 --- a/Network/Event/RequestUpdateGameData.h +++ b/Include/Network/Event/RequestUpdateGameData.hpp @@ -3,10 +3,10 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" -#include "../../Game/GameSession.h" +#include "Game/GameSession.hpp" class RequestUpdateGameData : public GenericRequest { diff --git a/Network/Event/RequestUserJoinSuccess.h b/Include/Network/Event/RequestUserJoinSuccess.hpp similarity index 90% rename from Network/Event/RequestUserJoinSuccess.h rename to Include/Network/Event/RequestUserJoinSuccess.hpp index 24bc126..8e447b7 100644 --- a/Network/Event/RequestUserJoinSuccess.h +++ b/Include/Network/Event/RequestUserJoinSuccess.hpp @@ -3,8 +3,8 @@ #include #include -#include "../GenericNetRequest.h" -#include "../GenericNetResponse.h" +#include "../GenericNetRequest.hpp" +#include "../GenericNetResponse.hpp" class RequestUserJoinSuccess : public GenericRequest { diff --git a/Include/Network/Event/Request_5F.h b/Include/Network/Event/Request_5F.h new file mode 100644 index 0000000..26c0667 --- /dev/null +++ b/Include/Network/Event/Request_5F.h @@ -0,0 +1,37 @@ +#pragma once + +#include +#include + +#include "../GenericNetRequest.h" +#include "../GenericNetResponse.h" + +class Request_5F : public GenericRequest +{ +private: + std::wstring m_sessionId; + std::wstring m_memberSessionId; + + enum CREATE_REPLY { + SUCCESS = 0, + FATAL_ERROR, + GENERAL_ERROR, + }; +public: + static std::unique_ptr< Request_5F > Create() + { + return std::make_unique< Request_5F >(); + } + + sptr_generic_response ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) override; + void Deserialize( sptr_byte_stream stream ) override; +}; + +class Result_5F : public GenericResponse { +private: + int32_t m_reply; + +public: + Result_5F( GenericRequest *request, int32_t reply ); + ByteBuffer &Serialize(); +}; \ No newline at end of file diff --git a/Include/Network/Event/Request_61.h b/Include/Network/Event/Request_61.h new file mode 100644 index 0000000..97f34b8 --- /dev/null +++ b/Include/Network/Event/Request_61.h @@ -0,0 +1,25 @@ +#pragma once + +#include +#include + +#include "../GenericNetRequest.h" +#include "../GenericNetResponse.h" + +class Request_61 : public GenericRequest +{ +public: + static std::unique_ptr< Request_61 > Create() + { + return std::make_unique< Request_61 >(); + } + + sptr_generic_response ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) override; + void Deserialize( sptr_byte_stream stream ) override; +}; + +class Result_61 : public GenericResponse { +public: + Result_61( GenericRequest *request ); + ByteBuffer &Serialize(); +}; \ No newline at end of file diff --git a/Network/Events.h b/Include/Network/Events.hpp similarity index 69% rename from Network/Events.h rename to Include/Network/Events.hpp index 20905a0..f4cd0b7 100644 --- a/Network/Events.h +++ b/Include/Network/Events.hpp @@ -3,60 +3,60 @@ #include #include -/* 0001 */ #include "Event/RequestAddFriend.h" -/* 0002 */ #include "Event/RequestAddIgnore.h" +/* 0001 */ #include "Event/RequestAddFriend.hpp" +/* 0002 */ #include "Event/RequestAddIgnore.hpp" -/* 0005 */ #include "Event/RequestCancelGame.h" -/* 0006 */ #include "Event/RequestCreateAccount.h" +/* 0005 */ #include "Event/RequestCancelGame.hpp" +/* 0006 */ #include "Event/RequestCreateAccount.hpp" -/* 0008 */ #include "Event/RequestCreatePrivateGame.h" -/* 0009 */ #include "Event/RequestCreatePrivateRoom.h" +/* 0008 */ #include "Event/RequestCreatePrivateGame.hpp" +/* 0009 */ #include "Event/RequestCreatePrivateRoom.hpp" -/* 000A */ #include "Event/RequestCreatePublicGame.h" +/* 000A */ #include "Event/RequestCreatePublicGame.hpp" -/* 000C */ #include "Event/RequestEnterRoom.h" -/* 000D */ #include "Event/RequestGetGame.h" -/* 000E */ #include "Event/RequestGetPublicRooms.h" -/* 000F */ #include "Event/RequestGetRealmStats.h" +/* 000C */ #include "Event/RequestEnterRoom.hpp" +/* 000D */ #include "Event/RequestGetGame.hpp" +/* 000E */ #include "Event/RequestGetPublicRooms.hpp" +/* 000F */ #include "Event/RequestGetRealmStats.hpp" -/* 0011 */ #include "Event/RequestGetRoom.h" -/* 0015 */ #include "Event/RequestLeaveRoom.h" -/* 0016 */ #include "Event/RequestLogin.h" -/* 0017 */ #include "Event/RequestLogout.h" -/* 0018 */ #include "Event/RequestMatchGame.h" +/* 0011 */ #include "Event/RequestGetRoom.hpp" +/* 0015 */ #include "Event/RequestLeaveRoom.hpp" +/* 0016 */ #include "Event/RequestLogin.hpp" +/* 0017 */ #include "Event/RequestLogout.hpp" +/* 0018 */ #include "Event/RequestMatchGame.hpp" -/* 001C */ #include "Event/RequestRemoveFriend.h" -/* 001D */ #include "Event/RequestRemoveIgnore.h" +/* 001C */ #include "Event/RequestRemoveFriend.hpp" +/* 001D */ #include "Event/RequestRemoveIgnore.hpp" -/* 0021 */ #include "Event/RequestSendInstantMessage.h" -/* 0022 */ #include "Event/RequestSendRoomMessage.h" -/* 0023 */ #include "Event/RequestStartGame.h" -/* 0024 */ #include "Event/RequestTouchSession.h" -/* 0025 */ #include "Event/RequestDoClientDiscovery.h" +/* 0021 */ #include "Event/RequestSendInstantMessage.hpp" +/* 0022 */ #include "Event/RequestSendRoomMessage.hpp" +/* 0023 */ #include "Event/RequestStartGame.hpp" +/* 0024 */ #include "Event/RequestTouchSession.hpp" +/* 0025 */ #include "Event/RequestDoClientDiscovery.hpp" -/* 0027 */ #include "Event/RequestGetEncryptionKey.h" +/* 0027 */ #include "Event/RequestGetEncryptionKey.hpp" -/* 0041 */ #include "Event/NotifyForcedLogout.h" -/* 0042 */ #include "Event/RequestGetRules.h" -/* 0043 */ #include "Event/RequestGetServerAddress.h" -/* 0044 */ #include "Event/RequestUpdateGameData.h" +/* 0041 */ #include "Event/NotifyForcedLogout.hpp" +/* 0042 */ #include "Event/RequestGetRules.hpp" +/* 0043 */ #include "Event/RequestGetServerAddress.hpp" +/* 0044 */ #include "Event/RequestUpdateGameData.hpp" -/* 0054 */ #include "Event/RequestCreatePublicGame_RTA.h" -/* 0055 */ #include "Event/RequestMatchGame_RTA.h" -/* 0056 */ #include "Event/RequestCreatePrivateGame_RTA.h" -/* 0057 */ #include "Event/RequestGetGame_RTA.h" +/* 0054 */ #include "Event/RequestCreatePublicGame_RTA.hpp" +/* 0055 */ #include "Event/RequestMatchGame_RTA.hpp" +/* 0056 */ #include "Event/RequestCreatePrivateGame_RTA.hpp" +/* 0057 */ #include "Event/RequestGetGame_RTA.hpp" -/* 0058 */ #include "Event/RequestCreateNewCharacter_RTA.h" -/* 005B */ #include "Event/RequestGetNetCharacterList_RTA.h" -/* 005C */ #include "Event/RequestGetCharacterData_RTA.h" -/* 005D */ #include "Event/RequestAppendCharacterData.h" -/* 005E */ #include "Event/RequestSaveCharacter_RTA.h" -/* 005F */ #include "Event/RequestUserJoinSuccess.h" -/* 0060 */ #include "Event/RequestCancelGame_RTA.h" -/* 0061 */ #include "Event/RequestGetSocialListInitial.h" -/* 0062 */ #include "Event/RequestGetSocialListUpdate.h" +/* 0058 */ #include "Event/RequestCreateNewCharacter_RTA.hpp" +/* 005B */ #include "Event/RequestGetNetCharacterList_RTA.hpp" +/* 005C */ #include "Event/RequestGetCharacterData_RTA.hpp" +/* 005D */ #include "Event/RequestAppendCharacterData.hpp" +/* 005E */ #include "Event/RequestSaveCharacter_RTA.hpp" +/* 005F */ #include "Event/RequestUserJoinSuccess.hpp" +/* 0060 */ #include "Event/RequestCancelGame_RTA.hpp" +/* 0061 */ #include "Event/RequestGetSocialListInitial.hpp" +/* 0062 */ #include "Event/RequestGetSocialListUpdate.hpp" -/* 0066 */ #include "Event/RequestDoClientDiscovery_RTA.h" +/* 0066 */ #include "Event/RequestDoClientDiscovery_RTA.hpp" const std::map< int16_t, std::function< std::unique_ptr< GenericRequest >() > > REQUEST_EVENT = diff --git a/Network/GenericNetMessage.h b/Include/Network/GenericNetMessage.hpp similarity index 90% rename from Network/GenericNetMessage.h rename to Include/Network/GenericNetMessage.hpp index 4e846e5..8a23504 100644 --- a/Network/GenericNetMessage.h +++ b/Include/Network/GenericNetMessage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../Common/ByteStream.h" +#include "Common/ByteStream.hpp" class GenericMessage { diff --git a/Network/GenericNetRequest.h b/Include/Network/GenericNetRequest.hpp similarity index 96% rename from Network/GenericNetRequest.h rename to Include/Network/GenericNetRequest.hpp index 0cc1b1f..139615d 100644 --- a/Network/GenericNetRequest.h +++ b/Include/Network/GenericNetRequest.hpp @@ -2,7 +2,7 @@ #include -#include "../Common/ByteStream.h" +#include "Common/ByteStream.hpp" class GenericResponse; using sptr_generic_response = std::shared_ptr< GenericResponse >; diff --git a/Network/GenericNetResponse.h b/Include/Network/GenericNetResponse.hpp similarity index 85% rename from Network/GenericNetResponse.h rename to Include/Network/GenericNetResponse.hpp index a0e0f45..6379c76 100644 --- a/Network/GenericNetResponse.h +++ b/Include/Network/GenericNetResponse.hpp @@ -1,7 +1,7 @@ #pragma once -#include "GenericNetRequest.h" -#include "../Common/ByteStream.h" +#include "GenericNetRequest.hpp" +#include "Common/ByteStream.hpp" class GenericResponse { diff --git a/Network/RealmSocket.h b/Include/Network/RealmSocket.hpp similarity index 90% rename from Network/RealmSocket.h rename to Include/Network/RealmSocket.hpp index f2c9735..add54c4 100644 --- a/Network/RealmSocket.h +++ b/Include/Network/RealmSocket.hpp @@ -5,10 +5,10 @@ #include #include -#include "GenericNetRequest.h" -#include "GenericNetResponse.h" -#include "GenericNetMessage.h" -#include "../Common/Constant.h" +#include "GenericNetRequest.hpp" +#include "GenericNetResponse.hpp" +#include "GenericNetMessage.hpp" +#include "Common/Constant.hpp" class RealmSocket { diff --git a/configuration.h b/Include/configuration.hpp similarity index 100% rename from configuration.h rename to Include/configuration.hpp diff --git a/logging.h b/Include/logging.hpp similarity index 99% rename from logging.h rename to Include/logging.hpp index 7cd2d5a..3ec7512 100644 --- a/logging.h +++ b/Include/logging.hpp @@ -103,7 +103,9 @@ public: template static void Debug( const std::string &format, Args&&... args ) { +#ifdef _DEBUG WriteToLog( log_debug, Format( format, std::forward( args )... ) ); +#endif } template diff --git a/resource.h b/Include/resource.h similarity index 100% rename from resource.h rename to Include/resource.h diff --git a/stdafx.h b/Include/stdafx.h similarity index 100% rename from stdafx.h rename to Include/stdafx.h diff --git a/targetver.h b/Include/targetver.h similarity index 100% rename from targetver.h rename to Include/targetver.h diff --git a/Network/GenericNetRequest.cpp b/Network/GenericNetRequest.cpp deleted file mode 100644 index a7d8d52..0000000 --- a/Network/GenericNetRequest.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "GenericNetRequest.h" \ No newline at end of file diff --git a/Common/ByteStream.cpp b/Source/Common/ByteStream.cpp similarity index 99% rename from Common/ByteStream.cpp rename to Source/Common/ByteStream.cpp index f0c47ce..3bfa0c3 100644 --- a/Common/ByteStream.cpp +++ b/Source/Common/ByteStream.cpp @@ -1,5 +1,6 @@ +#include "Common/ByteStream.hpp" + #include -#include "ByteStream.h" #include ByteBuffer::ByteBuffer( const std::vector< uint8_t > &data ) diff --git a/Common/Utility.cpp b/Source/Common/Utility.cpp similarity index 98% rename from Common/Utility.cpp rename to Source/Common/Utility.cpp index cc59d3a..82b1519 100644 --- a/Common/Utility.cpp +++ b/Source/Common/Utility.cpp @@ -6,7 +6,7 @@ #include #include -#include "Utility.h" +#include "Common/Utility.hpp" int32_t Util::round_up( int32_t numToRound, int32_t multiple ) { diff --git a/Crypto/PasswordHash.cpp b/Source/Crypto/PasswordHash.cpp similarity index 97% rename from Crypto/PasswordHash.cpp rename to Source/Crypto/PasswordHash.cpp index 71a7b2d..59d95a6 100644 --- a/Crypto/PasswordHash.cpp +++ b/Source/Crypto/PasswordHash.cpp @@ -3,7 +3,7 @@ #include #include -#include "PasswordHash.h" +#include "Crypto/PasswordHash.hpp" std::string HexDump( const std::vector &bytes ) { diff --git a/Crypto/RealmCrypt.cpp b/Source/Crypto/RealmCrypt.cpp similarity index 98% rename from Crypto/RealmCrypt.cpp rename to Source/Crypto/RealmCrypt.cpp index e72470d..24f2250 100644 --- a/Crypto/RealmCrypt.cpp +++ b/Source/Crypto/RealmCrypt.cpp @@ -1,6 +1,6 @@ -#include "RealmCrypt.h" -#include "../Common/Utility.h" +#include "Crypto/RealmCrypt.hpp" +#include "Common/Utility.hpp" RealmCrypt::RealmCrypt() { diff --git a/Crypto/rijndael.cpp b/Source/Crypto/rijndael.cpp similarity index 99% rename from Crypto/rijndael.cpp rename to Source/Crypto/rijndael.cpp index 616152e..5e1383a 100644 --- a/Crypto/rijndael.cpp +++ b/Source/Crypto/rijndael.cpp @@ -1,4 +1,4 @@ -#include "rijndael.h" +#include "Crypto/rijndael.hpp" rijndael::rijndael() { diff --git a/Database/Database.cpp b/Source/Database/Database.cpp similarity index 95% rename from Database/Database.cpp rename to Source/Database/Database.cpp index 0288f89..d908d6f 100644 --- a/Database/Database.cpp +++ b/Source/Database/Database.cpp @@ -1,18 +1,35 @@ -#include "Database.h" +#include "Database/Database.hpp" -#include "../../Crypto/PasswordHash.h" -#include "../../Game/RealmCharacter.h" -#include "../../Game/RealmCharacterMetaKV.h" -#include "../logging.h" +#include "Crypto/PasswordHash.hpp" +#include "Game/RealmCharacter.hpp" +#include "Game/RealmCharacterMetaKV.hpp" +#include "logging.hpp" + +#include +namespace fs = std::filesystem; Database::Database() { - if( sqlite3_open( "./database/game.db", &m_db ) != SQLITE_OK ) + const fs::path dbPath = "./database/game.db"; + const fs::path dbDir = dbPath.parent_path(); + + std::error_code ec; + if( !dbDir.empty() && !fs::exists( dbDir ) ) { - throw std::runtime_error( "Failed to open DB: " + std::string( sqlite3_errmsg( m_db ) ) ); + if( !fs::create_directories( dbDir, ec ) ) + { + throw std::runtime_error( + "Failed to create database directory: " + ec.message() + ); + } } - m_lastMaintenance = std::chrono::steady_clock::now(); + if( sqlite3_open( dbPath.string().c_str(), &m_db ) != SQLITE_OK ) + { + throw std::runtime_error( + "Failed to open DB: " + std::string( sqlite3_errmsg( m_db ) ) + ); + } CreateTables(); PrepareStatements(); @@ -25,17 +42,6 @@ Database::~Database() sqlite3_close( m_db ); } -void Database::Process() -{ - auto now = std::chrono::steady_clock::now(); - if( now - m_lastMaintenance < std::chrono::hours( 1 ) ) - return; - - m_lastMaintenance = now; - - Log::Info( "Performing database maintenance..." ); -} - void Database::CreateTables() { Execute( "CREATE TABLE IF NOT EXISTS RealmUsers (" @@ -196,7 +202,7 @@ int64_t Database::CreateNewAccount( const std::string &username, } catch( const std::exception &e ) { - throw std::runtime_error( "Database error: " + std::string( e.what() ) ); + Log::Error( "Database error: " + std::string( e.what() ) ); } return 0; @@ -231,7 +237,7 @@ Database::VerifyAccount( const std::wstring &username, const std::wstring &passw } else { - Log::Error( "Invalid credentials for account ID: {}", accountId ); + Log::Debug( "Invalid credentials for account ID: {}", accountId ); return std::make_tuple( false, -1, L"" ); } } diff --git a/Discovery Server/DiscoveryServer.cpp b/Source/Discovery Server/DiscoveryServer.cpp similarity index 95% rename from Discovery Server/DiscoveryServer.cpp rename to Source/Discovery Server/DiscoveryServer.cpp index 5e06889..816bd7a 100644 --- a/Discovery Server/DiscoveryServer.cpp +++ b/Source/Discovery Server/DiscoveryServer.cpp @@ -5,13 +5,12 @@ // ║║║╚═╗║ ║ ║╚╗╔╝║╣ ╠╦╝╚╦╝ ╚═╗║╣ ╠╦╝╚╗╔╝║╣ ╠╦╝ // ═╩╝╩╚═╝╚═╝╚═╝ ╚╝ ╚═╝╩╚═ ╩ ╚═╝╚═╝╩╚═ ╚╝ ╚═╝╩╚═ -#include "DiscoveryServer.h" - -#include "../Game/RealmUserManager.h" -#include "../Game/GameSessionManager.h" -#include "../Common/ByteStream.h" -#include "../logging.h" +#include "Discovery Server/DiscoveryServer.hpp" +#include "Common/ByteStream.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "logging.hpp" DiscoveryServer::DiscoveryServer() { diff --git a/Game/CharacterSaveManager.cpp b/Source/Game/CharacterSaveManager.cpp similarity index 96% rename from Game/CharacterSaveManager.cpp rename to Source/Game/CharacterSaveManager.cpp index 3c68b72..cfd6b6d 100644 --- a/Game/CharacterSaveManager.cpp +++ b/Source/Game/CharacterSaveManager.cpp @@ -7,12 +7,12 @@ * and the target user whose character is being saved. */ -#include "CharacterSaveManager.h" +#include "Game/CharacterSaveManager.hpp" -#include "RealmUser.h" -#include "RealmUserManager.h" -#include "../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUser.hpp" +#include "Game/RealmUserManager.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" CharacterSaveManager::CharacterSaveManager() { diff --git a/Game/ChatRoom.cpp b/Source/Game/ChatRoom.cpp similarity index 94% rename from Game/ChatRoom.cpp rename to Source/Game/ChatRoom.cpp index d18fd10..b79a14b 100644 --- a/Game/ChatRoom.cpp +++ b/Source/Game/ChatRoom.cpp @@ -1,6 +1,5 @@ -#include "ChatRoomSession.h" - -#include "RealmUser.h" +#include "Game/ChatRoomSession.hpp" +#include "Game/RealmUser.hpp" ChatRoomSession::ChatRoomSession() { diff --git a/Game/ChatRoomManager.cpp b/Source/Game/ChatRoomManager.cpp similarity index 97% rename from Game/ChatRoomManager.cpp rename to Source/Game/ChatRoomManager.cpp index bd0996c..856c11c 100644 --- a/Game/ChatRoomManager.cpp +++ b/Source/Game/ChatRoomManager.cpp @@ -1,9 +1,8 @@ -#include "ChatRoomManager.h" +#include "Game/ChatRoomManager.hpp" +#include "Game/RealmUser.hpp" -#include "RealmUser.h" - -#include "../Network/Event/NotifyRoomMessage.h" -#include "../logging.h" +#include "Network/Event/NotifyRoomMessage.hpp" +#include "logging.hpp" ChatRoomManager::ChatRoomManager() { diff --git a/Game/GameSession.cpp b/Source/Game/GameSession.cpp similarity index 97% rename from Game/GameSession.cpp rename to Source/Game/GameSession.cpp index cb70b8a..04f5c79 100644 --- a/Game/GameSession.cpp +++ b/Source/Game/GameSession.cpp @@ -1,8 +1,7 @@ -#include "GameSession.h" - -#include "RealmUser.h" -#include "../../logging.h" +#include "Game/GameSession.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" GameSession::GameSession( uint32_t index ) : m_gameId( index ) { diff --git a/Game/GameSessionManager.cpp b/Source/Game/GameSessionManager.cpp similarity index 96% rename from Game/GameSessionManager.cpp rename to Source/Game/GameSessionManager.cpp index 43b9db1..1bb3b21 100644 --- a/Game/GameSessionManager.cpp +++ b/Source/Game/GameSessionManager.cpp @@ -1,12 +1,12 @@ -#include "GameSessionManager.h" +#include "Game/GameSessionManager.hpp" -#include "RealmUser.h" -#include "../Network/Event/NotifyGameDiscovered.h" -#include "../Network/Event/NotifyClientDiscovered.h" -#include "../Network/Event/NotifyClientDiscovered_RTA.h" -#include "../Network/Event/NotifyClientRequestConnect.h" -#include "../Network/Event/NotifyClientRequestConnect_RTA.h" -#include "../../logging.h" +#include "Game/RealmUser.hpp" +#include "Network/Event/NotifyGameDiscovered.hpp" +#include "Network/Event/NotifyClientDiscovered.hpp" +#include "Network/Event/NotifyClientDiscovered_RTA.hpp" +#include "Network/Event/NotifyClientRequestConnect.hpp" +#include "Network/Event/NotifyClientRequestConnect_RTA.hpp" +#include "logging.hpp" GameSessionManager::GameSessionManager() { diff --git a/Game/RealmCharacter.cpp b/Source/Game/RealmCharacter.cpp similarity index 98% rename from Game/RealmCharacter.cpp rename to Source/Game/RealmCharacter.cpp index 7b0619a..8a46f37 100644 --- a/Game/RealmCharacter.cpp +++ b/Source/Game/RealmCharacter.cpp @@ -1,10 +1,9 @@ -#include "RealmCharacter.h" +#include "Game/RealmCharacter.hpp" +#include "Game/CharacterSaveTask.hpp" +#include "Common/ByteBufferReader.hpp" +#include "Common/RLEZ.hpp" -#include "CharacterSaveTask.h" -#include "../Common/ByteBufferReader.hpp" -#include "../Common/RLEZ.hpp" - -#include "../../logging.h" +#include "logging.hpp" RealmCharacter::RealmCharacter() { diff --git a/Game/RealmCharacterMetaKV.cpp b/Source/Game/RealmCharacterMetaKV.cpp similarity index 90% rename from Game/RealmCharacterMetaKV.cpp rename to Source/Game/RealmCharacterMetaKV.cpp index 87f75d4..23cdb17 100644 --- a/Game/RealmCharacterMetaKV.cpp +++ b/Source/Game/RealmCharacterMetaKV.cpp @@ -1,9 +1,9 @@ -#include "RealmCharacterMetaKV.h" +#include "Game/RealmCharacterMetaKV.hpp" -#include "../Common/ByteBufferReader.hpp" -#include "../Common/ByteStream.h" -#include "../Common/Utility.h" -#include "../logging.h" +#include "Common/ByteBufferReader.hpp" +#include "Common/ByteStream.hpp" +#include "Common/Utility.hpp" +#include "logging.hpp" CharacterSlotData::CharacterSlotData(const std::vector& data) { diff --git a/Game/RealmCharacterSaveTask.cpp b/Source/Game/RealmCharacterSaveTask.cpp similarity index 93% rename from Game/RealmCharacterSaveTask.cpp rename to Source/Game/RealmCharacterSaveTask.cpp index 963cd94..02fc345 100644 --- a/Game/RealmCharacterSaveTask.cpp +++ b/Source/Game/RealmCharacterSaveTask.cpp @@ -1,8 +1,8 @@ -#include "CharacterSaveTask.h" -#include "RealmCharacter.h" +#include "Game/CharacterSaveTask.hpp" +#include "Game/RealmCharacter.hpp" -#include "../Common/ByteBufferReader.hpp" -#include "../../logging.h" +#include "Common/ByteBufferReader.hpp" +#include "logging.hpp" CharacterSaveTask::CharacterSaveTask( CharacterSaveType Type, uint32_t characterId ) { diff --git a/Game/RealmUser.cpp b/Source/Game/RealmUser.cpp similarity index 91% rename from Game/RealmUser.cpp rename to Source/Game/RealmUser.cpp index 67242fb..99d290f 100644 --- a/Game/RealmUser.cpp +++ b/Source/Game/RealmUser.cpp @@ -1,5 +1,5 @@ -#include "RealmUser.h" -#include "RealmCharacter.h" +#include "Game/RealmUser.hpp" +#include "Game/RealmCharacter.hpp" RealmUser::RealmUser() { diff --git a/Game/RealmUserManager.cpp b/Source/Game/RealmUserManager.cpp similarity index 92% rename from Game/RealmUserManager.cpp rename to Source/Game/RealmUserManager.cpp index 87ff41b..8ecf0c9 100644 --- a/Game/RealmUserManager.cpp +++ b/Source/Game/RealmUserManager.cpp @@ -1,12 +1,12 @@ -#include "RealmUserManager.h" -#include "GameSessionManager.h" -#include "ChatRoomManager.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/ChatRoomManager.hpp" -#include "../Network/Event/NotifyForcedLogout.h" -#include "../Network/Event/NotifyFriendStatus.h" -#include "../Database/Database.h" -#include "../Common/Constant.h" -#include "../logging.h" +#include "Network/Event/NotifyForcedLogout.hpp" +#include "Network/Event/NotifyFriendStatus.hpp" +#include "Database/Database.hpp" +#include "Common/Constant.hpp" +#include "logging.hpp" UserManager::UserManager() { diff --git a/Lobby Server/LobbyServer.cpp b/Source/Lobby Server/LobbyServer.cpp similarity index 97% rename from Lobby Server/LobbyServer.cpp rename to Source/Lobby Server/LobbyServer.cpp index be99866..43f9a2a 100644 --- a/Lobby Server/LobbyServer.cpp +++ b/Source/Lobby Server/LobbyServer.cpp @@ -5,12 +5,12 @@ // ║ ║ ║╠╩╗╠╩╗╚╦╝ ╚═╗║╣ ╠╦╝╚╗╔╝║╣ ╠╦╝ // ╩═╝╚═╝╚═╝╚═╝ ╩ ╚═╝╚═╝╩╚═ ╚╝ ╚═╝╩╚═ -#include "LobbyServer.h" +#include "Lobby Server/LobbyServer.hpp" -#include "../Game/RealmUserManager.h" -#include "../Network/Events.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Network/Events.hpp" +#include "configuration.hpp" +#include "logging.hpp" LobbyServer::LobbyServer() { @@ -279,7 +279,7 @@ void LobbyServer::AcceptConnection( sptr_socket srcSocket ) UserManager::Get().CreateUser( new_socket, gameType ); } - Log::Info( "New Client Connected : ({})", new_socket->remote_ip ); + Log::Info( "New Client Connected : ({}) From Port {}", new_socket->remote_ip, srcSocket->remote_port ); } void LobbyServer::ReadSocket( sptr_socket socket ) diff --git a/Network/Event/NotifyClientDiscovered.cpp b/Source/Network/Event/NotifyClientDiscovered.cpp similarity index 81% rename from Network/Event/NotifyClientDiscovered.cpp rename to Source/Network/Event/NotifyClientDiscovered.cpp index c22e86a..f1246f4 100644 --- a/Network/Event/NotifyClientDiscovered.cpp +++ b/Source/Network/Event/NotifyClientDiscovered.cpp @@ -1,5 +1,5 @@ -#include "NotifyClientDiscovered.h" -#include "../../Game/RealmUser.h" +#include "Network\Event\NotifyClientDiscovered.hpp" +#include "Game/RealmUser.hpp" NotifyClientDiscovered::NotifyClientDiscovered( sptr_user user ) : GenericMessage( 0x40 ) { diff --git a/Network/Event/NotifyClientDiscovered_RTA.cpp b/Source/Network/Event/NotifyClientDiscovered_RTA.cpp similarity index 76% rename from Network/Event/NotifyClientDiscovered_RTA.cpp rename to Source/Network/Event/NotifyClientDiscovered_RTA.cpp index 43b56c4..b016279 100644 --- a/Network/Event/NotifyClientDiscovered_RTA.cpp +++ b/Source/Network/Event/NotifyClientDiscovered_RTA.cpp @@ -1,7 +1,7 @@ -#include "NotifyClientDiscovered_RTA.h" +#include "Network\Event\NotifyClientDiscovered_RTA.hpp" -#include "../../Common/Constant.h" -#include "../../Game/RealmUser.h" +#include "Common/Constant.hpp" +#include "Game/RealmUser.hpp" NotifyClientDiscovered_RTA::NotifyClientDiscovered_RTA( sptr_user user ) : GenericMessage( 0x40 ) { diff --git a/Network/Event/NotifyClientReqConnect.cpp b/Source/Network/Event/NotifyClientReqConnect.cpp similarity index 100% rename from Network/Event/NotifyClientReqConnect.cpp rename to Source/Network/Event/NotifyClientReqConnect.cpp diff --git a/Network/Event/NotifyClientRequestConnect.cpp b/Source/Network/Event/NotifyClientRequestConnect.cpp similarity index 81% rename from Network/Event/NotifyClientRequestConnect.cpp rename to Source/Network/Event/NotifyClientRequestConnect.cpp index 0bcec4c..13017c2 100644 --- a/Network/Event/NotifyClientRequestConnect.cpp +++ b/Source/Network/Event/NotifyClientRequestConnect.cpp @@ -1,6 +1,5 @@ -#include "NotifyClientRequestConnect.h" - -#include "../../Game/RealmUser.h" +#include "Network/Event/NotifyClientRequestConnect.hpp" +#include "Game/RealmUser.hpp" NotifyClientRequestConnect::NotifyClientRequestConnect( sptr_user user ) : GenericMessage( 0x3F ) { diff --git a/Network/Event/NotifyClientRequestConnect_RTA.cpp b/Source/Network/Event/NotifyClientRequestConnect_RTA.cpp similarity index 86% rename from Network/Event/NotifyClientRequestConnect_RTA.cpp rename to Source/Network/Event/NotifyClientRequestConnect_RTA.cpp index 260a400..9c2bca4 100644 --- a/Network/Event/NotifyClientRequestConnect_RTA.cpp +++ b/Source/Network/Event/NotifyClientRequestConnect_RTA.cpp @@ -1,6 +1,6 @@ -#include "NotifyClientRequestConnect_RTA.h" +#include "Network\Event\NotifyClientRequestConnect_RTA.hpp" -#include "../../Game/RealmUser.h" +#include "Game/RealmUser.hpp" NotifyClientRequestConnect_RTA::NotifyClientRequestConnect_RTA( sptr_user user ) : GenericMessage( 0x65 ) { diff --git a/Network/Event/NotifyForcedLogout.cpp b/Source/Network/Event/NotifyForcedLogout.cpp similarity index 81% rename from Network/Event/NotifyForcedLogout.cpp rename to Source/Network/Event/NotifyForcedLogout.cpp index 6feebb6..4e39885 100644 --- a/Network/Event/NotifyForcedLogout.cpp +++ b/Source/Network/Event/NotifyForcedLogout.cpp @@ -1,4 +1,4 @@ -#include "NotifyForcedLogout.h" +#include "Network/Event/NotifyForcedLogout.hpp" NotifyForcedLogout::NotifyForcedLogout() : GenericMessage( 0x41 ) { diff --git a/Network/Event/NotifyFriendStatus.cpp b/Source/Network/Event/NotifyFriendStatus.cpp similarity index 87% rename from Network/Event/NotifyFriendStatus.cpp rename to Source/Network/Event/NotifyFriendStatus.cpp index 51bc103..7c9f9a2 100644 --- a/Network/Event/NotifyFriendStatus.cpp +++ b/Source/Network/Event/NotifyFriendStatus.cpp @@ -1,4 +1,4 @@ -#include "NotifyFriendStatus.h" +#include "Network\Event\NotifyFriendStatus.hpp" NotifyFriendStatus::NotifyFriendStatus( std::wstring handle, bool status ) : GenericMessage( 0x2F ) { diff --git a/Network/Event/NotifyGameDiscovered.cpp b/Source/Network/Event/NotifyGameDiscovered.cpp similarity index 86% rename from Network/Event/NotifyGameDiscovered.cpp rename to Source/Network/Event/NotifyGameDiscovered.cpp index dc9c36a..7a4a861 100644 --- a/Network/Event/NotifyGameDiscovered.cpp +++ b/Source/Network/Event/NotifyGameDiscovered.cpp @@ -1,5 +1,5 @@ -#include "NotifyGameDiscovered.h" -#include "../../Game/RealmUser.h" +#include "Network/Event/NotifyGameDiscovered.hpp" +#include "Game/RealmUser.hpp" NotifyGameDiscovered::NotifyGameDiscovered( sptr_user user ) : GenericMessage( 0x3E ) { diff --git a/Network/Event/NotifyInstantMessage.cpp b/Source/Network/Event/NotifyInstantMessage.cpp similarity index 87% rename from Network/Event/NotifyInstantMessage.cpp rename to Source/Network/Event/NotifyInstantMessage.cpp index ee2bfdd..31027d0 100644 --- a/Network/Event/NotifyInstantMessage.cpp +++ b/Source/Network/Event/NotifyInstantMessage.cpp @@ -1,4 +1,4 @@ -#include "NotifyInstantMessage.h" +#include "Network\Event\NotifyInstantMessage.hpp" NotifyInstantMessage::NotifyInstantMessage( std::wstring chatHandle, std::wstring message ) : GenericMessage( 0x30 ) { diff --git a/Source/Network/Event/NotifyReserveUserSlot_RTA.cpp b/Source/Network/Event/NotifyReserveUserSlot_RTA.cpp new file mode 100644 index 0000000..e551a3e --- /dev/null +++ b/Source/Network/Event/NotifyReserveUserSlot_RTA.cpp @@ -0,0 +1,19 @@ +#include "NotifyReserveUserSlot_RTA.h" + +NotifyReserveUserSlot_RTA::NotifyReserveUserSlot_RTA( int32_t memberId, std::string discoveryAddr, int32_t discoveryPort ) : GenericMessage( 0x51 ) +{ + this->m_discoveryAddr = discoveryAddr; + this->m_port = discoveryPort; + this->m_memberId = memberId; +} + +// This notification is nullsub. +void NotifyReserveUserSlot_RTA::Serialize( ByteBuffer &out ) const +{ + out.write_u16( m_packetId ); + out.write_u32( 0 ); + + out.write_u32( 0 ); + out.write_utf8( "" ); + out.write_u32( 0 ); +} diff --git a/Network/Event/NotifyRoomMessage.cpp b/Source/Network/Event/NotifyRoomMessage.cpp similarity index 90% rename from Network/Event/NotifyRoomMessage.cpp rename to Source/Network/Event/NotifyRoomMessage.cpp index 9f37d47..9aa28b6 100644 --- a/Network/Event/NotifyRoomMessage.cpp +++ b/Source/Network/Event/NotifyRoomMessage.cpp @@ -1,4 +1,4 @@ -#include "NotifyRoomMessage.h" +#include "Network\Event\NotifyRoomMessage.hpp" NotifyRoomMessage::NotifyRoomMessage( std::wstring roomName, std::wstring chatHandle, std::wstring message ) : GenericMessage( 0x3D ) { diff --git a/Source/Network/Event/Notify_4C.cpp b/Source/Network/Event/Notify_4C.cpp new file mode 100644 index 0000000..30bd589 --- /dev/null +++ b/Source/Network/Event/Notify_4C.cpp @@ -0,0 +1,49 @@ +#include "Notify_4C.h" + +Notify_4C::Notify_4C() : GenericMessage( 0x4C ) +{ +} + +void Notify_4C::Serialize( ByteBuffer &out ) const +{ + out.write_u16( m_packetId ); + out.write_u32( 0 ); + + out.write_u32( 0 ); // Unknown + + out.write_u32( 1 ); // Unknown + { + out.write_utf16( L"Dummy 1" ); + } + + out.write_u32( 1 ); // Unknown + { + out.write_u32( 0 ); + // Blob + } + + out.write_u32( 1 ); // Unknown + { + out.write_u32( 0 ); + } + + out.write_u16( 0 ); // Unknown + + out.write_u32( 1 ); // Unknown + { + out.write_u16( 0 ); + out.write_u32( 0 ); + out.write_utf16( L"Dummy 2" ); + out.write_u32( 0 ); + out.write_u32( 0 ); + out.write_u32( 0 ); + out.write_u16( 1 ); + } + + out.write_u32( 0 ); // Unknown + + out.write_utf8( "127.0.0.1" ); + + out.write_u32( 0 ); // Unknown + out.write_u32( 0 ); // Unknown +} diff --git a/Source/Network/Event/Notify_65.cpp b/Source/Network/Event/Notify_65.cpp new file mode 100644 index 0000000..943835a --- /dev/null +++ b/Source/Network/Event/Notify_65.cpp @@ -0,0 +1,22 @@ +#include "Notify_65.h" + +NotifyClientRequestsConnect2::NotifyClientRequestsConnect2( std::string discoveryAddr, std::string localAddr, int32_t port ) : GenericMessage( 0x65 ) +{ + m_discoveryAddr = std::move( discoveryAddr ); + m_localAddr = std::move( localAddr ); + m_port = port; +} + +ByteBuffer &NotifyClientRequestsConnect2::Serialize() +{ + m_stream.write_u16( m_packetId ); + m_stream.write_u32( 0 ); + + m_stream.write_utf8( m_discoveryAddr ); + m_stream.write_u32( m_port ); + + m_stream.write_utf8( m_localAddr ); + m_stream.write_u32( m_port ); + + return m_stream; +} diff --git a/Network/Event/RequestAddFriend.cpp b/Source/Network/Event/RequestAddFriend.cpp similarity index 91% rename from Network/Event/RequestAddFriend.cpp rename to Source/Network/Event/RequestAddFriend.cpp index 56eece1..f08a245 100644 --- a/Network/Event/RequestAddFriend.cpp +++ b/Source/Network/Event/RequestAddFriend.cpp @@ -1,8 +1,8 @@ -#include "RequestAddFriend.h" +#include "Network/Event/RequestAddFriend.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestAddFriend::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestAddIgnore.cpp b/Source/Network/Event/RequestAddIgnore.cpp similarity index 91% rename from Network/Event/RequestAddIgnore.cpp rename to Source/Network/Event/RequestAddIgnore.cpp index 981cffc..654125f 100644 --- a/Network/Event/RequestAddIgnore.cpp +++ b/Source/Network/Event/RequestAddIgnore.cpp @@ -1,8 +1,8 @@ -#include "RequestAddIgnore.h" +#include "Network/Event/RequestAddIgnore.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestAddIgnore::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestAppendCharacterData.cpp b/Source/Network/Event/RequestAppendCharacterData.cpp similarity index 82% rename from Network/Event/RequestAppendCharacterData.cpp rename to Source/Network/Event/RequestAppendCharacterData.cpp index 5a0cd39..6d38b65 100644 --- a/Network/Event/RequestAppendCharacterData.cpp +++ b/Source/Network/Event/RequestAppendCharacterData.cpp @@ -1,10 +1,10 @@ -#include "RequestAppendCharacterData.h" +#include "Network/Event/RequestAppendCharacterData.hpp" -#include "../../Game/CharacterSaveManager.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/CharacterSaveManager.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestAppendCharacterData::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCancelGame.cpp b/Source/Network/Event/RequestCancelGame.cpp similarity index 87% rename from Network/Event/RequestCancelGame.cpp rename to Source/Network/Event/RequestCancelGame.cpp index 18c9048..e483f2d 100644 --- a/Network/Event/RequestCancelGame.cpp +++ b/Source/Network/Event/RequestCancelGame.cpp @@ -1,8 +1,7 @@ -#include "RequestCancelGame.h" - -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../logging.h" +#include "Network/Event/RequestCancelGame.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "logging.hpp" void RequestCancelGame::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCancelGame_RTA.cpp b/Source/Network/Event/RequestCancelGame_RTA.cpp similarity index 88% rename from Network/Event/RequestCancelGame_RTA.cpp rename to Source/Network/Event/RequestCancelGame_RTA.cpp index bebf38d..ba582fb 100644 --- a/Network/Event/RequestCancelGame_RTA.cpp +++ b/Source/Network/Event/RequestCancelGame_RTA.cpp @@ -1,9 +1,9 @@ -#include "RequestCancelGame_RTA.h" +#include "Network/Event/RequestCancelGame_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "logging.hpp" void RequestCancelGame_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCreateAccount.cpp b/Source/Network/Event/RequestCreateAccount.cpp similarity index 91% rename from Network/Event/RequestCreateAccount.cpp rename to Source/Network/Event/RequestCreateAccount.cpp index 2b5f31f..396003c 100644 --- a/Network/Event/RequestCreateAccount.cpp +++ b/Source/Network/Event/RequestCreateAccount.cpp @@ -1,11 +1,11 @@ -#include "RequestCreateAccount.h" +#include "Network/Event/RequestCreateAccount.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Crypto/PasswordHash.h" -#include "../../Common/Constant.h" -#include "../../Game/RealmUser.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Common/Constant.hpp" +#include "Crypto/PasswordHash.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestCreateAccount::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCreateNewCharacter_RTA.cpp b/Source/Network/Event/RequestCreateNewCharacter_RTA.cpp similarity index 86% rename from Network/Event/RequestCreateNewCharacter_RTA.cpp rename to Source/Network/Event/RequestCreateNewCharacter_RTA.cpp index 87486ea..163e828 100644 --- a/Network/Event/RequestCreateNewCharacter_RTA.cpp +++ b/Source/Network/Event/RequestCreateNewCharacter_RTA.cpp @@ -1,11 +1,11 @@ -#include "RequestCreateNewCharacter_RTA.h" +#include "Network/Event/RequestCreateNewCharacter_RTA.hpp" -#include "../../Database/Database.h" -#include "../../Game/CharacterSaveManager.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Game/RealmCharacter.h" -#include "../../logging.h" +#include "Database/Database.hpp" +#include "Game/CharacterSaveManager.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Game/RealmCharacter.hpp" +#include "logging.hpp" void RequestCreateNewCharacter_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCreatePrivateGame.cpp b/Source/Network/Event/RequestCreatePrivateGame.cpp similarity index 90% rename from Network/Event/RequestCreatePrivateGame.cpp rename to Source/Network/Event/RequestCreatePrivateGame.cpp index 21b2bfe..a16dfd3 100644 --- a/Network/Event/RequestCreatePrivateGame.cpp +++ b/Source/Network/Event/RequestCreatePrivateGame.cpp @@ -1,9 +1,9 @@ -#include "RequestCreatePrivateGame.h" +#include "Network/Event/RequestCreatePrivateGame.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "configuration.hpp" +#include "logging.hpp" void RequestCreatePrivateGame::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCreatePrivateGame_RTA.cpp b/Source/Network/Event/RequestCreatePrivateGame_RTA.cpp similarity index 90% rename from Network/Event/RequestCreatePrivateGame_RTA.cpp rename to Source/Network/Event/RequestCreatePrivateGame_RTA.cpp index 5deffbd..9515269 100644 --- a/Network/Event/RequestCreatePrivateGame_RTA.cpp +++ b/Source/Network/Event/RequestCreatePrivateGame_RTA.cpp @@ -1,9 +1,9 @@ -#include "RequestCreatePrivateGame_RTA.h" +#include "Network/Event/RequestCreatePrivateGame_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "configuration.hpp" +#include "logging.hpp" void RequestCreatePrivateGame_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCreatePrivateRoom.cpp b/Source/Network/Event/RequestCreatePrivateRoom.cpp similarity index 87% rename from Network/Event/RequestCreatePrivateRoom.cpp rename to Source/Network/Event/RequestCreatePrivateRoom.cpp index 7dfcc2e..8beb860 100644 --- a/Network/Event/RequestCreatePrivateRoom.cpp +++ b/Source/Network/Event/RequestCreatePrivateRoom.cpp @@ -1,8 +1,8 @@ -#include "RequestCreatePrivateRoom.h" +#include "Network/Event/RequestCreatePrivateRoom.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "logging.hpp" void RequestCreatePrivateRoom::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestCreatePublicGame.cpp b/Source/Network/Event/RequestCreatePublicGame.cpp similarity index 93% rename from Network/Event/RequestCreatePublicGame.cpp rename to Source/Network/Event/RequestCreatePublicGame.cpp index 4fa6fdd..5b90ac9 100644 --- a/Network/Event/RequestCreatePublicGame.cpp +++ b/Source/Network/Event/RequestCreatePublicGame.cpp @@ -1,9 +1,9 @@ -#include "RequestCreatePublicGame.h" +#include "Network/Event/RequestCreatePublicGame.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "configuration.hpp" +#include "logging.hpp" // Request void RequestCreatePublicGame::Deserialize( sptr_byte_stream stream ) diff --git a/Network/Event/RequestCreatePublicGame_RTA.cpp b/Source/Network/Event/RequestCreatePublicGame_RTA.cpp similarity index 92% rename from Network/Event/RequestCreatePublicGame_RTA.cpp rename to Source/Network/Event/RequestCreatePublicGame_RTA.cpp index 393aa10..9df150e 100644 --- a/Network/Event/RequestCreatePublicGame_RTA.cpp +++ b/Source/Network/Event/RequestCreatePublicGame_RTA.cpp @@ -1,10 +1,10 @@ -#include "RequestCreatePublicGame_RTA.h" +#include "Network/Event/RequestCreatePublicGame_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "configuration.hpp" +#include "logging.hpp" void RequestCreatePublicGame_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestDoClientDiscovery.cpp b/Source/Network/Event/RequestDoClientDiscovery.cpp similarity index 89% rename from Network/Event/RequestDoClientDiscovery.cpp rename to Source/Network/Event/RequestDoClientDiscovery.cpp index c25b9fd..f84559b 100644 --- a/Network/Event/RequestDoClientDiscovery.cpp +++ b/Source/Network/Event/RequestDoClientDiscovery.cpp @@ -1,9 +1,9 @@ -#include "RequestDoClientDiscovery.h" +#include "Network/Event/RequestDoClientDiscovery.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "configuration.hpp" +#include "logging.hpp" void RequestDoClientDiscovery::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestDoClientDiscovery_RTA.cpp b/Source/Network/Event/RequestDoClientDiscovery_RTA.cpp similarity index 89% rename from Network/Event/RequestDoClientDiscovery_RTA.cpp rename to Source/Network/Event/RequestDoClientDiscovery_RTA.cpp index 06e2adb..195552d 100644 --- a/Network/Event/RequestDoClientDiscovery_RTA.cpp +++ b/Source/Network/Event/RequestDoClientDiscovery_RTA.cpp @@ -1,9 +1,9 @@ -#include "RequestDoClientDiscovery_RTA.h" +#include "Network/Event/RequestDoClientDiscovery_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "configuration.hpp" +#include "logging.hpp" void RequestDoClientDiscovery_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestEnterRoom.cpp b/Source/Network/Event/RequestEnterRoom.cpp similarity index 93% rename from Network/Event/RequestEnterRoom.cpp rename to Source/Network/Event/RequestEnterRoom.cpp index 1230e4c..81bb8f4 100644 --- a/Network/Event/RequestEnterRoom.cpp +++ b/Source/Network/Event/RequestEnterRoom.cpp @@ -1,8 +1,8 @@ -#include "RequestEnterRoom.h" +#include "Network/Event/RequestEnterRoom.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "logging.hpp" void RequestEnterRoom::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetCharacterData_RTA.cpp b/Source/Network/Event/RequestGetCharacterData_RTA.cpp similarity index 93% rename from Network/Event/RequestGetCharacterData_RTA.cpp rename to Source/Network/Event/RequestGetCharacterData_RTA.cpp index 1638f79..fd818b2 100644 --- a/Network/Event/RequestGetCharacterData_RTA.cpp +++ b/Source/Network/Event/RequestGetCharacterData_RTA.cpp @@ -1,9 +1,9 @@ -#include "RequestGetCharacterData_RTA.h" +#include "Network/Event/RequestGetCharacterData_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestGetNetCharacterData_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetEncryptionKey.cpp b/Source/Network/Event/RequestGetEncryptionKey.cpp similarity index 74% rename from Network/Event/RequestGetEncryptionKey.cpp rename to Source/Network/Event/RequestGetEncryptionKey.cpp index 6fec07f..4edbb56 100644 --- a/Network/Event/RequestGetEncryptionKey.cpp +++ b/Source/Network/Event/RequestGetEncryptionKey.cpp @@ -1,4 +1,4 @@ -#include "RequestGetEncryptionKey.h" +#include "Network/Event/RequestGetEncryptionKey.hpp" void RequestGetEncryptionKey::Deserialize( sptr_byte_stream stream ) { @@ -26,9 +26,9 @@ void ResultGetEncryptionKey::Serialize( ByteBuffer &out ) const out.write_u32( m_trackId ); out.write_u32( 0 ); - auto encrypted = RealmCrypt::encryptSymmetric( m_symKey ); + const auto encrypted = RealmCrypt::encryptSymmetric( m_symKey ); - out.write_u32( encrypted.size() + 4 ); - out.write_u32( m_symKey.size() ); + out.write_u32( static_cast( encrypted.size() ) + 4 ); + out.write_u32( static_cast( m_symKey.size() ) ); out.write_bytes( encrypted ); } diff --git a/Source/Network/Event/RequestGetFriendList.cpp b/Source/Network/Event/RequestGetFriendList.cpp new file mode 100644 index 0000000..774fe68 --- /dev/null +++ b/Source/Network/Event/RequestGetFriendList.cpp @@ -0,0 +1,38 @@ +#include "RequestGetFriendList.h" + +void RequestGetFriendList::Deserialize( sptr_byte_stream stream ) +{ + DeserializeHeader( stream ); +} + +sptr_generic_response RequestGetFriendList::ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) +{ + Deserialize( stream ); + + auto publicKey = stream->read_utf8(); + auto unknown = stream->read_u32(); + + return std::make_shared< ResultGetFriendList >( this ); +} + +ResultGetFriendList::ResultGetFriendList( GenericRequest *request ) : GenericResponse( *request ) +{ +} + +void ResultGetFriendList::Serialize( ByteBuffer &out ) const +{ + out.write_u16( m_packetId ); + out.write_u32( m_trackId ); + out.write_u32( 0 ); + + // Friends + out.write_u32(1); + out.write_utf16(L"String_1"); + + out.write_u32(1); + out.write_utf16(L"String_2"); + + // Ignore + out.write_u32(1); + out.write_utf16(L"String_3"); +} diff --git a/Network/Event/RequestGetGame.cpp b/Source/Network/Event/RequestGetGame.cpp similarity index 90% rename from Network/Event/RequestGetGame.cpp rename to Source/Network/Event/RequestGetGame.cpp index 18edb32..d0aa6d7 100644 --- a/Network/Event/RequestGetGame.cpp +++ b/Source/Network/Event/RequestGetGame.cpp @@ -1,9 +1,9 @@ -#include "RequestGetGame.h" +#include "Network/Event/RequestGetGame.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/RealmUser.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" void RequestGetGame::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetGame_RTA.cpp b/Source/Network/Event/RequestGetGame_RTA.cpp similarity index 92% rename from Network/Event/RequestGetGame_RTA.cpp rename to Source/Network/Event/RequestGetGame_RTA.cpp index 5e36366..27fcb67 100644 --- a/Network/Event/RequestGetGame_RTA.cpp +++ b/Source/Network/Event/RequestGetGame_RTA.cpp @@ -1,9 +1,9 @@ -#include "RequestGetGame_RTA.h" +#include "Network/Event/RequestGetGame_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/RealmUser.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" void RequestGetGame_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetNetCharacterList_RTA.cpp b/Source/Network/Event/RequestGetNetCharacterList_RTA.cpp similarity index 86% rename from Network/Event/RequestGetNetCharacterList_RTA.cpp rename to Source/Network/Event/RequestGetNetCharacterList_RTA.cpp index 6e18ecf..5748282 100644 --- a/Network/Event/RequestGetNetCharacterList_RTA.cpp +++ b/Source/Network/Event/RequestGetNetCharacterList_RTA.cpp @@ -1,10 +1,10 @@ -#include "RequestGetNetCharacterList_RTA.h" +#include "Network/Event/RequestGetNetCharacterList_RTA.hpp" -#include "../../Game/RealmUser.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmCharacterMetaKV.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUser.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmCharacterMetaKV.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestGetNetCharacterList_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetPublicRooms.cpp b/Source/Network/Event/RequestGetPublicRooms.cpp similarity index 93% rename from Network/Event/RequestGetPublicRooms.cpp rename to Source/Network/Event/RequestGetPublicRooms.cpp index 36e1704..50ad7fb 100644 --- a/Network/Event/RequestGetPublicRooms.cpp +++ b/Source/Network/Event/RequestGetPublicRooms.cpp @@ -1,6 +1,6 @@ -#include "RequestGetPublicRooms.h" +#include "Network/Event/RequestGetPublicRooms.hpp" -#include "../../Game/ChatRoomManager.h" +#include "Game/ChatRoomManager.hpp" void RequestGetPublicRooms::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetRealmStats.cpp b/Source/Network/Event/RequestGetRealmStats.cpp similarity index 92% rename from Network/Event/RequestGetRealmStats.cpp rename to Source/Network/Event/RequestGetRealmStats.cpp index 224d781..d80c74c 100644 --- a/Network/Event/RequestGetRealmStats.cpp +++ b/Source/Network/Event/RequestGetRealmStats.cpp @@ -1,6 +1,6 @@ -#include "RequestGetRealmStats.h" +#include "Network/Event/RequestGetRealmStats.hpp" -#include "../../Game/RealmUserManager.h" +#include "Game/RealmUserManager.hpp" void RequestGetRealmStats::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetRoom.cpp b/Source/Network/Event/RequestGetRoom.cpp similarity index 92% rename from Network/Event/RequestGetRoom.cpp rename to Source/Network/Event/RequestGetRoom.cpp index dc90769..7148400 100644 --- a/Network/Event/RequestGetRoom.cpp +++ b/Source/Network/Event/RequestGetRoom.cpp @@ -1,9 +1,9 @@ -#include "RequestGetRoom.h" +#include "Network/Event/RequestGetRoom.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/ChatRoomManager.h" +#include "Game/RealmUserManager.hpp" +#include "Game/ChatRoomManager.hpp" -#include "../../logging.h" +#include "logging.hpp" void RequestGetRoom::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetRules.cpp b/Source/Network/Event/RequestGetRules.cpp similarity index 89% rename from Network/Event/RequestGetRules.cpp rename to Source/Network/Event/RequestGetRules.cpp index d189875..856025c 100644 --- a/Network/Event/RequestGetRules.cpp +++ b/Source/Network/Event/RequestGetRules.cpp @@ -1,9 +1,9 @@ -#include "RequestGetRules.h" +#include "Network/Event/RequestGetRules.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Common/Constant.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Common/Constant.hpp" +#include "logging.hpp" void RequestGetRules::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetServerAddress.cpp b/Source/Network/Event/RequestGetServerAddress.cpp similarity index 83% rename from Network/Event/RequestGetServerAddress.cpp rename to Source/Network/Event/RequestGetServerAddress.cpp index e056aa0..53e5952 100644 --- a/Network/Event/RequestGetServerAddress.cpp +++ b/Source/Network/Event/RequestGetServerAddress.cpp @@ -1,10 +1,10 @@ -#include "RequestGetServerAddress.h" +#include "Network/Event/RequestGetServerAddress.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Common/Constant.h" -#include "../../configuration.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Common/Constant.hpp" +#include "configuration.hpp" +#include "logging.hpp" void RequestGetServerAddress::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetSocialListInitial.cpp b/Source/Network/Event/RequestGetSocialListInitial.cpp similarity index 89% rename from Network/Event/RequestGetSocialListInitial.cpp rename to Source/Network/Event/RequestGetSocialListInitial.cpp index db7e2fc..c9436fd 100644 --- a/Network/Event/RequestGetSocialListInitial.cpp +++ b/Source/Network/Event/RequestGetSocialListInitial.cpp @@ -1,8 +1,8 @@ -#include "RequestGetSocialListInitial.h" +#include "Network/Event/RequestGetSocialListInitial.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" void RequestGetSocialListInitial::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestGetSocialListUpdate.cpp b/Source/Network/Event/RequestGetSocialListUpdate.cpp similarity index 89% rename from Network/Event/RequestGetSocialListUpdate.cpp rename to Source/Network/Event/RequestGetSocialListUpdate.cpp index e87bbd1..417058d 100644 --- a/Network/Event/RequestGetSocialListUpdate.cpp +++ b/Source/Network/Event/RequestGetSocialListUpdate.cpp @@ -1,8 +1,8 @@ -#include "RequestGetSocialListUpdate.h" +#include "Network/Event/RequestGetSocialListUpdate.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" void RequestGetSocialListUpdate::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestLeaveRoom.cpp b/Source/Network/Event/RequestLeaveRoom.cpp similarity index 88% rename from Network/Event/RequestLeaveRoom.cpp rename to Source/Network/Event/RequestLeaveRoom.cpp index 408985a..7925365 100644 --- a/Network/Event/RequestLeaveRoom.cpp +++ b/Source/Network/Event/RequestLeaveRoom.cpp @@ -1,8 +1,8 @@ -#include "RequestLeaveRoom.h" +#include "Network/Event/RequestLeaveRoom.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "logging.hpp" void RequestLeaveRoom::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestLogin.cpp b/Source/Network/Event/RequestLogin.cpp similarity index 94% rename from Network/Event/RequestLogin.cpp rename to Source/Network/Event/RequestLogin.cpp index 0300017..b0bece8 100644 --- a/Network/Event/RequestLogin.cpp +++ b/Source/Network/Event/RequestLogin.cpp @@ -1,10 +1,10 @@ -#include "RequestLogin.h" +#include "Network/Event/RequestLogin.hpp" -#include "../../Database/Database.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Common/Constant.h" -#include "../../logging.h" +#include "Database/Database.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Common/Constant.hpp" +#include "logging.hpp" void RequestLogin::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestLogout.cpp b/Source/Network/Event/RequestLogout.cpp similarity index 86% rename from Network/Event/RequestLogout.cpp rename to Source/Network/Event/RequestLogout.cpp index 57043e5..a229d8e 100644 --- a/Network/Event/RequestLogout.cpp +++ b/Source/Network/Event/RequestLogout.cpp @@ -1,7 +1,7 @@ -#include "RequestLogout.h" +#include "Network/Event/RequestLogout.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "logging.hpp" void RequestLogout::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestMatchGame.cpp b/Source/Network/Event/RequestMatchGame.cpp similarity index 92% rename from Network/Event/RequestMatchGame.cpp rename to Source/Network/Event/RequestMatchGame.cpp index 842e24c..7859484 100644 --- a/Network/Event/RequestMatchGame.cpp +++ b/Source/Network/Event/RequestMatchGame.cpp @@ -1,11 +1,11 @@ -#include "RequestMatchGame.h" +#include "Network/Event/RequestMatchGame.hpp" #include -#include "../../Common/Constant.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/RealmUser.h" +#include "Common/Constant.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/RealmUser.hpp" void RequestMatchGame::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestMatchGame_RTA.cpp b/Source/Network/Event/RequestMatchGame_RTA.cpp similarity index 93% rename from Network/Event/RequestMatchGame_RTA.cpp rename to Source/Network/Event/RequestMatchGame_RTA.cpp index 03104ea..0070204 100644 --- a/Network/Event/RequestMatchGame_RTA.cpp +++ b/Source/Network/Event/RequestMatchGame_RTA.cpp @@ -1,8 +1,8 @@ -#include "RequestMatchGame_RTA.h" +#include "Network/Event/RequestMatchGame_RTA.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "logging.hpp" void RequestMatchGame_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestRemoveFriend.cpp b/Source/Network/Event/RequestRemoveFriend.cpp similarity index 90% rename from Network/Event/RequestRemoveFriend.cpp rename to Source/Network/Event/RequestRemoveFriend.cpp index 28b557a..16441df 100644 --- a/Network/Event/RequestRemoveFriend.cpp +++ b/Source/Network/Event/RequestRemoveFriend.cpp @@ -1,8 +1,8 @@ -#include "RequestRemoveFriend.h" +#include "Network/Event/RequestRemoveFriend.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestRemoveFriend::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestRemoveIgnore.cpp b/Source/Network/Event/RequestRemoveIgnore.cpp similarity index 90% rename from Network/Event/RequestRemoveIgnore.cpp rename to Source/Network/Event/RequestRemoveIgnore.cpp index 7bbb927..3750dc4 100644 --- a/Network/Event/RequestRemoveIgnore.cpp +++ b/Source/Network/Event/RequestRemoveIgnore.cpp @@ -1,8 +1,8 @@ -#include "RequestRemoveIgnore.h" +#include "Network/Event/RequestRemoveIgnore.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestRemoveIgnore::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestSaveCharacter_RTA.cpp b/Source/Network/Event/RequestSaveCharacter_RTA.cpp similarity index 84% rename from Network/Event/RequestSaveCharacter_RTA.cpp rename to Source/Network/Event/RequestSaveCharacter_RTA.cpp index fb60b5d..305bbd5 100644 --- a/Network/Event/RequestSaveCharacter_RTA.cpp +++ b/Source/Network/Event/RequestSaveCharacter_RTA.cpp @@ -1,14 +1,14 @@ -#include "RequestSaveCharacter_RTA.h" +#include "Network/Event/RequestSaveCharacter_RTA.hpp" -#include "../../Database/Database.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/CharacterSaveManager.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Game/RealmCharacter.h" -#include "../../logging.h" +#include "Database/Database.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/CharacterSaveManager.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Game/RealmCharacter.hpp" +#include "logging.hpp" -#include "../../Common/RLEZ.hpp" +#include "Common/RLEZ.hpp" void RequestSaveCharacter_RTA::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestSendInstantMessage.cpp b/Source/Network/Event/RequestSendInstantMessage.cpp similarity index 87% rename from Network/Event/RequestSendInstantMessage.cpp rename to Source/Network/Event/RequestSendInstantMessage.cpp index 6232af0..2922ed2 100644 --- a/Network/Event/RequestSendInstantMessage.cpp +++ b/Source/Network/Event/RequestSendInstantMessage.cpp @@ -1,9 +1,9 @@ -#include "RequestSendInstantMessage.h" +#include "Network/Event/RequestSendInstantMessage.hpp" -#include "NotifyInstantMessage.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../logging.h" +#include "Network\Event\NotifyInstantMessage.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "logging.hpp" void RequestSendInstantMessage::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestSendRoomMessage.cpp b/Source/Network/Event/RequestSendRoomMessage.cpp similarity index 89% rename from Network/Event/RequestSendRoomMessage.cpp rename to Source/Network/Event/RequestSendRoomMessage.cpp index fb62d12..3fc5e87 100644 --- a/Network/Event/RequestSendRoomMessage.cpp +++ b/Source/Network/Event/RequestSendRoomMessage.cpp @@ -1,10 +1,10 @@ -#include "RequestSendRoomMessage.h" +#include "Network/Event/RequestSendRoomMessage.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/ChatRoomManager.h" +#include "Game/RealmUserManager.hpp" +#include "Game/ChatRoomManager.hpp" -#include "NotifyRoomMessage.h" -#include "../../logging.h" +#include "Network\Event\NotifyRoomMessage.hpp" +#include "logging.hpp" void RequestSendRoomMessage::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestStartGame.cpp b/Source/Network/Event/RequestStartGame.cpp similarity index 86% rename from Network/Event/RequestStartGame.cpp rename to Source/Network/Event/RequestStartGame.cpp index 6f23019..9b033e1 100644 --- a/Network/Event/RequestStartGame.cpp +++ b/Source/Network/Event/RequestStartGame.cpp @@ -1,10 +1,10 @@ -#include "RequestStartGame.h" +#include "Network/Event/RequestStartGame.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/ChatRoomManager.h" -#include "../../Game/RealmUser.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/ChatRoomManager.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" void RequestStartGame::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestTouchSession.cpp b/Source/Network/Event/RequestTouchSession.cpp similarity index 87% rename from Network/Event/RequestTouchSession.cpp rename to Source/Network/Event/RequestTouchSession.cpp index c50094d..2ce775b 100644 --- a/Network/Event/RequestTouchSession.cpp +++ b/Source/Network/Event/RequestTouchSession.cpp @@ -1,7 +1,7 @@ -#include "RequestTouchSession.h" +#include "Network/Event/RequestTouchSession.hpp" -#include "../../Game/RealmUserManager.h" -#include "../../logging.h" +#include "Game/RealmUserManager.hpp" +#include "logging.hpp" void RequestTouchSession::Deserialize( sptr_byte_stream stream ) { diff --git a/Network/Event/RequestUpdateGameData.cpp b/Source/Network/Event/RequestUpdateGameData.cpp similarity index 86% rename from Network/Event/RequestUpdateGameData.cpp rename to Source/Network/Event/RequestUpdateGameData.cpp index 4630daa..4df367a 100644 --- a/Network/Event/RequestUpdateGameData.cpp +++ b/Source/Network/Event/RequestUpdateGameData.cpp @@ -1,9 +1,14 @@ -#include "RequestUpdateGameData.h" +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4996) +#endif -#include "../../Game/RealmUserManager.h" -#include "../../Game/GameSessionManager.h" -#include "../../Game/RealmUser.h" -#include "../../logging.h" +#include "Network/Event/RequestUpdateGameData.hpp" + +#include "Game/RealmUserManager.hpp" +#include "Game/GameSessionManager.hpp" +#include "Game/RealmUser.hpp" +#include "logging.hpp" void RequestUpdateGameData::Deserialize( sptr_byte_stream stream ) { @@ -80,3 +85,7 @@ void ResultUpdateGameData::Serialize( ByteBuffer &out ) const out.write_u32( m_trackId ); out.write_u32( 0 ); } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif \ No newline at end of file diff --git a/Network/Event/RequestUserJoinSuccess.cpp b/Source/Network/Event/RequestUserJoinSuccess.cpp similarity index 87% rename from Network/Event/RequestUserJoinSuccess.cpp rename to Source/Network/Event/RequestUserJoinSuccess.cpp index e7a8cac..1bbb2ca 100644 --- a/Network/Event/RequestUserJoinSuccess.cpp +++ b/Source/Network/Event/RequestUserJoinSuccess.cpp @@ -1,10 +1,10 @@ -#include "RequestUserJoinSuccess.h" +#include "Network/Event/RequestUserJoinSuccess.hpp" -#include "../../Game/GameSessionManager.h" -#include "../../Game/RealmUserManager.h" -#include "../../Game/RealmUser.h" -#include "../../Database/Database.h" -#include "../../logging.h" +#include "Game/GameSessionManager.hpp" +#include "Game/RealmUserManager.hpp" +#include "Game/RealmUser.hpp" +#include "Database/Database.hpp" +#include "logging.hpp" void RequestUserJoinSuccess::Deserialize( sptr_byte_stream stream ) { diff --git a/Source/Network/Event/Request_5F.cpp b/Source/Network/Event/Request_5F.cpp new file mode 100644 index 0000000..b365bb7 --- /dev/null +++ b/Source/Network/Event/Request_5F.cpp @@ -0,0 +1,72 @@ +#include "Request_5F.h" + +#include "../../Game/GameSessionManager.h" +#include "../../Game/RealmUserManager.h" +#include "../../Game/RealmUser.h" +#include "../../Database/Database.h" +#include "../../logging.h" + +void Request_5F::Deserialize( sptr_byte_stream stream ) +{ + DeserializeHeader( stream ); + + m_sessionId = stream->read_encrypted_utf16(); + m_memberSessionId = stream->read_encrypted_utf16(); +} + +sptr_generic_response Request_5F::ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) +{ + Deserialize( stream ); + + Log::Packet( stream->get_buffer(), stream->get_length(), false ); + + //auto user = UserManager::Get().FindUserBySocket( socket ); + //if( user == nullptr ) + //{ + // return std::make_shared< Result_5F >( this, FATAL_ERROR ); + //} + // + //auto targetUser = UserManager::Get().FindUserBySessionId( m_memberSessionId ); + //if( targetUser == nullptr || targetUser->m_accountId == -1 ) + //{ + // Log::Error( "Target user not found or invalid account ID for session: %S", m_memberSessionId.c_str() ); + // return std::make_shared< Result_5F >( this, FATAL_ERROR ); + //} + // + //auto gameSession = GameSessionManager::Get().FindGame( user->m_gameId, user->m_gameType ); + //if( gameSession == nullptr ) + //{ + // Log::Error( "Game session not found for user: %S", user->m_sessionId.c_str() ); + // return std::make_shared< Result_5F >( this, FATAL_ERROR ); + //} + // + //if( !gameSession->IsJoinable() ) + //{ + // Log::Error( "Game session is not open for user: %S", user->m_sessionId.c_str() ); + // return std::make_shared< Result_5F >( this, FATAL_ERROR ); + //} + // + //if( !gameSession->AddMember( targetUser ) ) + //{ + // Log::Error( "Failed to add user %S to game session %d", targetUser->m_sessionId.c_str(), gameSession->m_gameIndex ); + // return std::make_shared< Result_5F >( this, FATAL_ERROR ); + //} + + // TODO: Here is more like finalize/confirm joined + + return std::make_shared< Result_5F >( this, SUCCESS ); +} + +Result_5F::Result_5F( GenericRequest *request, int32_t reply ) : GenericResponse( *request ) +{ + m_reply = reply; +} + +ByteBuffer& Result_5F::Serialize() +{ + m_stream.write_u16( m_packetId ); + m_stream.write_u32( m_trackId ); + m_stream.write_u32( m_reply ); + + return m_stream; +} diff --git a/Source/Network/Event/Request_61.cpp b/Source/Network/Event/Request_61.cpp new file mode 100644 index 0000000..b1572c4 --- /dev/null +++ b/Source/Network/Event/Request_61.cpp @@ -0,0 +1,40 @@ +#include "Request_61.h" + +void Request_61::Deserialize( sptr_byte_stream stream ) +{ + DeserializeHeader( stream ); +} + +sptr_generic_response Request_61::ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) +{ + Deserialize( stream ); + + auto publicKey = stream->read_utf8(); + auto unknown = stream->read_u32(); + + return std::make_shared< Result_61 >( this ); +} + +Result_61::Result_61( GenericRequest *request ) : GenericResponse( *request ) +{ +} + +ByteBuffer&Result_61::Serialize() +{ + m_stream.write_u16( m_packetId ); + m_stream.write_u32( m_trackId ); + m_stream.write_u32( 0 ); + + // Friends + m_stream.write_u32(1); + m_stream.write_utf16(L"String_1"); + + m_stream.write_u32(1); + m_stream.write_utf16(L"String_2"); + + // Ignore + m_stream.write_u32(1); + m_stream.write_utf16(L"String_3"); + + return m_stream; +} diff --git a/Source/Network/GenericNetRequest.cpp b/Source/Network/GenericNetRequest.cpp new file mode 100644 index 0000000..08a3ac5 --- /dev/null +++ b/Source/Network/GenericNetRequest.cpp @@ -0,0 +1 @@ +#include "Network/GenericNetRequest.hpp" \ No newline at end of file diff --git a/Network/RealmSocket.cpp b/Source/Network/RealmSocket.cpp similarity index 96% rename from Network/RealmSocket.cpp rename to Source/Network/RealmSocket.cpp index e0ac9ce..8440579 100644 --- a/Network/RealmSocket.cpp +++ b/Source/Network/RealmSocket.cpp @@ -1,5 +1,5 @@ -#include "RealmSocket.h" -#include "../Common/Utility.h" +#include "Network/RealmSocket.hpp" +#include "Common/Utility.hpp" RealmSocket::RealmSocket() { diff --git a/configuration.cpp b/Source/configuration.cpp similarity index 96% rename from configuration.cpp rename to Source/configuration.cpp index 381522c..b57417f 100644 --- a/configuration.cpp +++ b/Source/configuration.cpp @@ -1,4 +1,4 @@ -#include "configuration.h" +#include "configuration.hpp" bool Config::Load( std::string filename ) { diff --git a/logging.cpp b/Source/logging.cpp similarity index 98% rename from logging.cpp rename to Source/logging.cpp index 774da2f..9c89150 100644 --- a/logging.cpp +++ b/Source/logging.cpp @@ -1,4 +1,4 @@ -#include "logging.h" +#include "logging.hpp" static const char *LOG_PATH[] = { "./generic", @@ -90,6 +90,10 @@ void Log::WriteToLog( LOG_TYPE type, const std::string &message ) void Log::Packet( std::vector p, size_t size, bool send ) { +#ifndef _DEBUG + return; +#endif + std::lock_guard lock( log_lock ); HANDLE hConsole = GetStdHandle( STD_OUTPUT_HANDLE ); diff --git a/main.cpp b/Source/main.cpp similarity index 90% rename from main.cpp rename to Source/main.cpp index 960d7ff..f3c30b4 100644 --- a/main.cpp +++ b/Source/main.cpp @@ -4,11 +4,11 @@ #include #include -#include "logging.h" -#include "configuration.h" -#include "Database/Database.h" -#include "Lobby Server/LobbyServer.h" -#include "Discovery Server/DiscoveryServer.h" +#include "logging.hpp" +#include "configuration.hpp" +#include "Database/Database.hpp" +#include "Lobby Server/LobbyServer.hpp" +#include "Discovery Server/DiscoveryServer.hpp" std::atomic< bool > g_isRunning( true ); @@ -88,8 +88,6 @@ int main() break; } - database.Process(); - std::this_thread::sleep_for( std::chrono::milliseconds( 250 ) ); } diff --git a/stdafx.cpp b/Source/stdafx.cpp similarity index 100% rename from stdafx.cpp rename to Source/stdafx.cpp