Reorganized and cleaned up the solution.

This commit is contained in:
HikikoMarmy
2026-03-02 12:37:07 +00:00
parent 8012f30170
commit d4dfbddf69
175 changed files with 1516 additions and 1136 deletions

View File

@@ -30,26 +30,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
@@ -81,7 +81,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>.\bin\</OutDir> <OutDir>.\bin\</OutDir>
<TargetName>Server_64</TargetName> <TargetName>Server_64_dbg</TargetName>
<EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild> <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
<IntDir>$(SolutionDir)obj\$(Configuration)\</IntDir> <IntDir>$(SolutionDir)obj\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
@@ -129,7 +129,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\Dependency\sqlite\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\Include;.\Dependency\sqlite\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp20</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
@@ -138,7 +138,7 @@
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>.\lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>.\lib</AdditionalLibraryDirectories>
<OutputFile>.\bin\Server_64.exe</OutputFile> <OutputFile>.\bin\Server_64_dbg.exe</OutputFile>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>
@@ -177,13 +177,15 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\Dependency\sqlite\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\Include;.\Dependency\sqlite\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp20</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<OutputFile>.\bin\Server_64.exe</OutputFile>
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>
@@ -191,166 +193,166 @@
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Common\ByteBufferReader.hpp" /> <ClInclude Include="Include\Common\ByteBufferReader.hpp" />
<ClInclude Include="Common\ByteStream.h" /> <ClInclude Include="Include\Common\ByteStream.hpp" />
<ClInclude Include="Common\Constant.h" /> <ClInclude Include="Include\Common\Constant.hpp" />
<ClInclude Include="Common\ForwardDecl.h" /> <ClInclude Include="Include\Common\ForwardDecl.hpp" />
<ClInclude Include="Common\RLEZ.hpp" /> <ClInclude Include="Include\Common\RLEZ.hpp" />
<ClInclude Include="Common\Utility.h" /> <ClInclude Include="Include\Common\Utility.hpp" />
<ClInclude Include="configuration.h" /> <ClInclude Include="Include\configuration.hpp" />
<ClInclude Include="Crypto\PasswordHash.h" /> <ClInclude Include="Include\Crypto\PasswordHash.hpp" />
<ClInclude Include="Crypto\RealmCrypt.h" /> <ClInclude Include="Include\Crypto\RealmCrypt.hpp" />
<ClInclude Include="Crypto\rijndael.h" /> <ClInclude Include="Include\Crypto\rijndael.hpp" />
<ClInclude Include="Database\Database.h" /> <ClInclude Include="Include\Database\Database.hpp" />
<ClInclude Include="Database\Transaction.h" /> <ClInclude Include="Include\Database\Transaction.hpp" />
<ClInclude Include="Discovery Server\DiscoveryServer.h" /> <ClInclude Include="Include\Discovery Server\DiscoveryServer.hpp" />
<ClInclude Include="Game\CharacterSaveManager.h" /> <ClInclude Include="Include\Game\CharacterSaveManager.hpp" />
<ClInclude Include="Game\ChatRoomSession.h" /> <ClInclude Include="Include\Game\ChatRoomSession.hpp" />
<ClInclude Include="Game\ChatRoomManager.h" /> <ClInclude Include="Include\Game\ChatRoomManager.hpp" />
<ClInclude Include="Game\RealmCharacter.h" /> <ClInclude Include="Include\Game\RealmCharacter.hpp" />
<ClInclude Include="Game\RealmCharacterMetaKV.h" /> <ClInclude Include="Include\Game\RealmCharacterMetaKV.hpp" />
<ClInclude Include="Game\CharacterSaveTask.h" /> <ClInclude Include="Include\Game\CharacterSaveTask.hpp" />
<ClInclude Include="Game\RealmUser.h" /> <ClInclude Include="Include\Game\RealmUser.hpp" />
<ClInclude Include="Game\RealmUserManager.h" /> <ClInclude Include="Include\Game\RealmUserManager.hpp" />
<ClInclude Include="Game\GameSession.h" /> <ClInclude Include="Include\Game\GameSession.hpp" />
<ClInclude Include="Game\GameSessionManager.h" /> <ClInclude Include="Include\Game\GameSessionManager.hpp" />
<ClInclude Include="Lobby Server\LobbyServer.h" /> <ClInclude Include="Include\Lobby Server\LobbyServer.hpp" />
<ClInclude Include="logging.h" /> <ClInclude Include="Include\logging.hpp" />
<ClInclude Include="Network\Events.h" /> <ClInclude Include="Include\Network\Events.hpp" />
<ClInclude Include="Network\Event\NotifyClientDiscovered.h" /> <ClInclude Include="Include\Network\Event\NotifyClientDiscovered.hpp" />
<ClInclude Include="Network\Event\NotifyClientDiscovered_RTA.h" /> <ClInclude Include="Include\Network\Event\NotifyClientDiscovered_RTA.hpp" />
<ClInclude Include="Network\Event\NotifyClientRequestConnect.h" /> <ClInclude Include="Include\Network\Event\NotifyClientRequestConnect.hpp" />
<ClInclude Include="Network\Event\NotifyForcedLogout.h" /> <ClInclude Include="Include\Network\Event\NotifyForcedLogout.hpp" />
<ClInclude Include="Network\Event\NotifyFriendStatus.h" /> <ClInclude Include="Include\Network\Event\NotifyFriendStatus.hpp" />
<ClInclude Include="Network\Event\NotifyGameDiscovered.h" /> <ClInclude Include="Include\Network\Event\NotifyGameDiscovered.hpp" />
<ClInclude Include="Network\Event\NotifyClientRequestConnect_RTA.h" /> <ClInclude Include="Include\Network\Event\NotifyClientRequestConnect_RTA.hpp" />
<ClInclude Include="Network\Event\NotifyInstantMessage.h" /> <ClInclude Include="Include\Network\Event\NotifyInstantMessage.hpp" />
<ClInclude Include="Network\Event\NotifyRoomMessage.h" /> <ClInclude Include="Include\Network\Event\NotifyRoomMessage.hpp" />
<ClInclude Include="Network\Event\RequestAddFriend.h" /> <ClInclude Include="Include\Network\Event\RequestAddFriend.hpp" />
<ClInclude Include="Network\Event\RequestAddIgnore.h" /> <ClInclude Include="Include\Network\Event\RequestAddIgnore.hpp" />
<ClInclude Include="Network\Event\RequestCancelGame.h" /> <ClInclude Include="Include\Network\Event\RequestCancelGame.hpp" />
<ClInclude Include="Network\Event\RequestCancelGame_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestCancelGame_RTA.hpp" />
<ClInclude Include="Network\Event\RequestCreateAccount.h" /> <ClInclude Include="Include\Network\Event\RequestCreateAccount.hpp" />
<ClInclude Include="Network\Event\RequestCreatePrivateGame.h" /> <ClInclude Include="Include\Network\Event\RequestCreatePrivateGame.hpp" />
<ClInclude Include="Network\Event\RequestCreatePrivateGame_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestCreatePrivateGame_RTA.hpp" />
<ClInclude Include="Network\Event\RequestCreatePrivateRoom.h" /> <ClInclude Include="Include\Network\Event\RequestCreatePrivateRoom.hpp" />
<ClInclude Include="Network\Event\RequestCreatePublicGame.h" /> <ClInclude Include="Include\Network\Event\RequestCreatePublicGame.hpp" />
<ClInclude Include="Network\Event\RequestCreatePublicGame_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestCreatePublicGame_RTA.hpp" />
<ClInclude Include="Network\Event\RequestDoClientDiscovery.h" /> <ClInclude Include="Include\Network\Event\RequestDoClientDiscovery.hpp" />
<ClInclude Include="Network\Event\RequestEnterRoom.h" /> <ClInclude Include="Include\Network\Event\RequestEnterRoom.hpp" />
<ClInclude Include="Network\Event\RequestGetCharacterData_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestGetCharacterData_RTA.hpp" />
<ClInclude Include="Network\Event\RequestGetEncryptionKey.h" /> <ClInclude Include="Include\Network\Event\RequestGetEncryptionKey.hpp" />
<ClInclude Include="Network\Event\RequestGetGame.h" /> <ClInclude Include="Include\Network\Event\RequestGetGame.hpp" />
<ClInclude Include="Network\Event\RequestDoClientDiscovery_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestDoClientDiscovery_RTA.hpp" />
<ClInclude Include="Network\Event\RequestGetGame_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestGetGame_RTA.hpp" />
<ClInclude Include="Network\Event\RequestGetPublicRooms.h" /> <ClInclude Include="Include\Network\Event\RequestGetPublicRooms.hpp" />
<ClInclude Include="Network\Event\RequestGetRealmStats.h" /> <ClInclude Include="Include\Network\Event\RequestGetRealmStats.hpp" />
<ClInclude Include="Network\Event\RequestGetRoom.h" /> <ClInclude Include="Include\Network\Event\RequestGetRoom.hpp" />
<ClInclude Include="Network\Event\RequestGetRules.h" /> <ClInclude Include="Include\Network\Event\RequestGetRules.hpp" />
<ClInclude Include="Network\Event\RequestGetServerAddress.h" /> <ClInclude Include="Include\Network\Event\RequestGetServerAddress.hpp" />
<ClInclude Include="Network\Event\RequestGetSocialListInitial.h" /> <ClInclude Include="Include\Network\Event\RequestGetSocialListInitial.hpp" />
<ClInclude Include="Network\Event\RequestGetSocialListUpdate.h" /> <ClInclude Include="Include\Network\Event\RequestGetSocialListUpdate.hpp" />
<ClInclude Include="Network\Event\RequestLeaveRoom.h" /> <ClInclude Include="Include\Network\Event\RequestLeaveRoom.hpp" />
<ClInclude Include="Network\Event\RequestLogin.h" /> <ClInclude Include="Include\Network\Event\RequestLogin.hpp" />
<ClInclude Include="Network\Event\RequestLogout.h" /> <ClInclude Include="Include\Network\Event\RequestLogout.hpp" />
<ClInclude Include="Network\Event\RequestMatchGame.h" /> <ClInclude Include="Include\Network\Event\RequestMatchGame.hpp" />
<ClInclude Include="Network\Event\RequestMatchGame_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestMatchGame_RTA.hpp" />
<ClInclude Include="Network\Event\RequestCreateNewCharacter_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestCreateNewCharacter_RTA.hpp" />
<ClInclude Include="Network\Event\RequestRemoveFriend.h" /> <ClInclude Include="Include\Network\Event\RequestRemoveFriend.hpp" />
<ClInclude Include="Network\Event\RequestRemoveIgnore.h" /> <ClInclude Include="Include\Network\Event\RequestRemoveIgnore.hpp" />
<ClInclude Include="Network\Event\RequestSaveCharacter_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestSaveCharacter_RTA.hpp" />
<ClInclude Include="Network\Event\RequestSendInstantMessage.h" /> <ClInclude Include="Include\Network\Event\RequestSendInstantMessage.hpp" />
<ClInclude Include="Network\Event\RequestSendRoomMessage.h" /> <ClInclude Include="Include\Network\Event\RequestSendRoomMessage.hpp" />
<ClInclude Include="Network\Event\RequestStartGame.h" /> <ClInclude Include="Include\Network\Event\RequestStartGame.hpp" />
<ClInclude Include="Network\Event\RequestTouchSession.h" /> <ClInclude Include="Include\Network\Event\RequestTouchSession.hpp" />
<ClInclude Include="Network\Event\RequestUpdateGameData.h" /> <ClInclude Include="Include\Network\Event\RequestUpdateGameData.hpp" />
<ClInclude Include="Network\Event\RequestGetNetCharacterList_RTA.h" /> <ClInclude Include="Include\Network\Event\RequestGetNetCharacterList_RTA.hpp" />
<ClInclude Include="Network\Event\RequestAppendCharacterData.h" /> <ClInclude Include="Include\Network\Event\RequestAppendCharacterData.hpp" />
<ClInclude Include="Network\Event\RequestUserJoinSuccess.h" /> <ClInclude Include="Include\Network\Event\RequestUserJoinSuccess.hpp" />
<ClInclude Include="Network\GenericNetMessage.h" /> <ClInclude Include="Include\Network\GenericNetMessage.hpp" />
<ClInclude Include="Network\GenericNetRequest.h" /> <ClInclude Include="Include\Network\GenericNetRequest.hpp" />
<ClInclude Include="Network\GenericNetResponse.h" /> <ClInclude Include="Include\Network\GenericNetResponse.hpp" />
<ClInclude Include="network\RealmSocket.h" /> <ClInclude Include="Include\network\RealmSocket.hpp" />
<ClInclude Include="resource.h" /> <ClInclude Include="Include\resource.h" />
<ClInclude Include="stdafx.h" /> <ClInclude Include="Include\stdafx.h" />
<ClInclude Include="targetver.h" /> <ClInclude Include="Include\targetver.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Common\ByteStream.cpp" />
<ClCompile Include="Common\Utility.cpp" />
<ClCompile Include="configuration.cpp" />
<ClCompile Include="Crypto\PasswordHash.cpp" />
<ClCompile Include="Crypto\RealmCrypt.cpp" />
<ClCompile Include="Crypto\rijndael.cpp" />
<ClCompile Include="Database\Database.cpp" />
<ClCompile Include="Dependency\sqlite\sqlite3.c" /> <ClCompile Include="Dependency\sqlite\sqlite3.c" />
<ClCompile Include="Discovery Server\DiscoveryServer.cpp" /> <ClCompile Include="Source\Common\ByteStream.cpp" />
<ClCompile Include="Game\CharacterSaveManager.cpp" /> <ClCompile Include="Source\Common\Utility.cpp" />
<ClCompile Include="Game\ChatRoom.cpp" /> <ClCompile Include="Source\configuration.cpp" />
<ClCompile Include="Game\ChatRoomManager.cpp" /> <ClCompile Include="Source\Crypto\PasswordHash.cpp" />
<ClCompile Include="Game\RealmCharacter.cpp" /> <ClCompile Include="Source\Crypto\RealmCrypt.cpp" />
<ClCompile Include="Game\RealmCharacterMetaKV.cpp" /> <ClCompile Include="Source\Crypto\rijndael.cpp" />
<ClCompile Include="Game\RealmCharacterSaveTask.cpp" /> <ClCompile Include="Source\Database\Database.cpp" />
<ClCompile Include="Game\RealmUser.cpp" /> <ClCompile Include="Source\Discovery Server\DiscoveryServer.cpp" />
<ClCompile Include="Game\RealmUserManager.cpp" /> <ClCompile Include="Source\Game\CharacterSaveManager.cpp" />
<ClCompile Include="Game\GameSession.cpp" /> <ClCompile Include="Source\Game\ChatRoom.cpp" />
<ClCompile Include="Game\GameSessionManager.cpp" /> <ClCompile Include="Source\Game\ChatRoomManager.cpp" />
<ClCompile Include="Lobby Server\LobbyServer.cpp" /> <ClCompile Include="Source\Game\RealmCharacter.cpp" />
<ClCompile Include="logging.cpp" /> <ClCompile Include="Source\Game\RealmCharacterMetaKV.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="Source\Game\RealmCharacterSaveTask.cpp" />
<ClCompile Include="Network\Event\NotifyClientDiscovered.cpp" /> <ClCompile Include="Source\Game\RealmUser.cpp" />
<ClCompile Include="Network\Event\NotifyClientDiscovered_RTA.cpp" /> <ClCompile Include="Source\Game\RealmUserManager.cpp" />
<ClCompile Include="Network\Event\NotifyClientRequestConnect.cpp" /> <ClCompile Include="Source\Game\GameSession.cpp" />
<ClCompile Include="Network\Event\NotifyForcedLogout.cpp" /> <ClCompile Include="Source\Game\GameSessionManager.cpp" />
<ClCompile Include="Network\Event\NotifyFriendStatus.cpp" /> <ClCompile Include="Source\Lobby Server\LobbyServer.cpp" />
<ClCompile Include="Network\Event\NotifyGameDiscovered.cpp" /> <ClCompile Include="Source\logging.cpp" />
<ClCompile Include="Network\Event\NotifyClientRequestConnect_RTA.cpp" /> <ClCompile Include="Source\main.cpp" />
<ClCompile Include="Network\Event\NotifyInstantMessage.cpp" /> <ClCompile Include="Source\Network\Event\NotifyClientDiscovered.cpp" />
<ClCompile Include="Network\Event\NotifyRoomMessage.cpp" /> <ClCompile Include="Source\Network\Event\NotifyClientDiscovered_RTA.cpp" />
<ClCompile Include="Network\Event\RequestAddFriend.cpp" /> <ClCompile Include="Source\Network\Event\NotifyClientRequestConnect.cpp" />
<ClCompile Include="Network\Event\RequestAddIgnore.cpp" /> <ClCompile Include="Source\Network\Event\NotifyForcedLogout.cpp" />
<ClCompile Include="Network\Event\RequestCancelGame.cpp" /> <ClCompile Include="Source\Network\Event\NotifyFriendStatus.cpp" />
<ClCompile Include="Network\Event\RequestCancelGame_RTA.cpp" /> <ClCompile Include="Source\Network\Event\NotifyGameDiscovered.cpp" />
<ClCompile Include="Network\Event\RequestCreateAccount.cpp" /> <ClCompile Include="Source\Network\Event\NotifyClientRequestConnect_RTA.cpp" />
<ClCompile Include="Network\Event\RequestCreatePrivateGame.cpp" /> <ClCompile Include="Source\Network\Event\NotifyInstantMessage.cpp" />
<ClCompile Include="Network\Event\RequestCreatePrivateGame_RTA.cpp" /> <ClCompile Include="Source\Network\Event\NotifyRoomMessage.cpp" />
<ClCompile Include="Network\Event\RequestCreatePrivateRoom.cpp" /> <ClCompile Include="Source\Network\Event\RequestAddFriend.cpp" />
<ClCompile Include="Network\Event\RequestCreatePublicGame.cpp" /> <ClCompile Include="Source\Network\Event\RequestAddIgnore.cpp" />
<ClCompile Include="Network\Event\RequestCreatePublicGame_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestCancelGame.cpp" />
<ClCompile Include="Network\Event\RequestDoClientDiscovery.cpp" /> <ClCompile Include="Source\Network\Event\RequestCancelGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestEnterRoom.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreateAccount.cpp" />
<ClCompile Include="Network\Event\RequestGetCharacterData_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreatePrivateGame.cpp" />
<ClCompile Include="Network\Event\RequestGetEncryptionKey.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreatePrivateGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestGetGame.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreatePrivateRoom.cpp" />
<ClCompile Include="Network\Event\RequestDoClientDiscovery_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreatePublicGame.cpp" />
<ClCompile Include="Network\Event\RequestGetGame_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreatePublicGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestGetRealmStats.cpp" /> <ClCompile Include="Source\Network\Event\RequestDoClientDiscovery.cpp" />
<ClCompile Include="Network\Event\RequestGetRoom.cpp" /> <ClCompile Include="Source\Network\Event\RequestEnterRoom.cpp" />
<ClCompile Include="Network\Event\RequestGetRules.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetCharacterData_RTA.cpp" />
<ClCompile Include="Network\Event\RequestGetServerAddress.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetEncryptionKey.cpp" />
<ClCompile Include="Network\Event\RequestGetSocialListUpdate.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetGame.cpp" />
<ClCompile Include="Network\Event\RequestLeaveRoom.cpp" /> <ClCompile Include="Source\Network\Event\RequestDoClientDiscovery_RTA.cpp" />
<ClCompile Include="Network\Event\RequestLogin.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestLogout.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetRealmStats.cpp" />
<ClCompile Include="Network\Event\RequestMatchGame.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetRoom.cpp" />
<ClCompile Include="Network\Event\RequestCreateNewCharacter_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetRules.cpp" />
<ClCompile Include="Network\Event\RequestRemoveFriend.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetServerAddress.cpp" />
<ClCompile Include="Network\Event\RequestRemoveIgnore.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetSocialListUpdate.cpp" />
<ClCompile Include="Network\Event\RequestSaveCharacter_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestLeaveRoom.cpp" />
<ClCompile Include="Network\Event\RequestSendInstantMessage.cpp" /> <ClCompile Include="Source\Network\Event\RequestLogin.cpp" />
<ClCompile Include="Network\Event\RequestSendRoomMessage.cpp" /> <ClCompile Include="Source\Network\Event\RequestLogout.cpp" />
<ClCompile Include="Network\Event\RequestStartGame.cpp" /> <ClCompile Include="Source\Network\Event\RequestMatchGame.cpp" />
<ClCompile Include="Network\Event\RequestTouchSession.cpp" /> <ClCompile Include="Source\Network\Event\RequestCreateNewCharacter_RTA.cpp" />
<ClCompile Include="Network\Event\RequestUpdateGameData.cpp" /> <ClCompile Include="Source\Network\Event\RequestRemoveFriend.cpp" />
<ClCompile Include="Network\Event\RequestGetPublicRooms.cpp" /> <ClCompile Include="Source\Network\Event\RequestRemoveIgnore.cpp" />
<ClCompile Include="Network\Event\RequestMatchGame_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestSaveCharacter_RTA.cpp" />
<ClCompile Include="Network\Event\RequestGetNetCharacterList_RTA.cpp" /> <ClCompile Include="Source\Network\Event\RequestSendInstantMessage.cpp" />
<ClCompile Include="Network\Event\RequestAppendCharacterData.cpp" /> <ClCompile Include="Source\Network\Event\RequestSendRoomMessage.cpp" />
<ClCompile Include="Network\Event\RequestUserJoinSuccess.cpp" /> <ClCompile Include="Source\Network\Event\RequestStartGame.cpp" />
<ClCompile Include="Network\Event\RequestGetSocialListInitial.cpp" /> <ClCompile Include="Source\Network\Event\RequestTouchSession.cpp" />
<ClCompile Include="Network\GenericNetRequest.cpp" /> <ClCompile Include="Source\Network\Event\RequestUpdateGameData.cpp" />
<ClCompile Include="network\RealmSocket.cpp" /> <ClCompile Include="Source\Network\Event\RequestGetPublicRooms.cpp" />
<ClCompile Include="stdafx.cpp"> <ClCompile Include="Source\Network\Event\RequestMatchGame_RTA.cpp" />
<ClCompile Include="Source\Network\Event\RequestGetNetCharacterList_RTA.cpp" />
<ClCompile Include="Source\Network\Event\RequestAppendCharacterData.cpp" />
<ClCompile Include="Source\Network\Event\RequestUserJoinSuccess.cpp" />
<ClCompile Include="Source\Network\Event\RequestGetSocialListInitial.cpp" />
<ClCompile Include="Source\Network\GenericNetRequest.cpp" />
<ClCompile Include="Source\network\RealmSocket.cpp" />
<ClCompile Include="Source\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -358,10 +360,10 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Champions Server.rc" /> <Image Include="icon.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="C:\Users\Adam\Desktop\icon.ico" /> <ResourceCompile Include="Include\Champions Server.rc" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

File diff suppressed because it is too large Load Diff

View File

@@ -6,8 +6,8 @@
#include <iterator> #include <iterator>
#include <optional> #include <optional>
#include "Utility.h" #include "Utility.hpp"
#include "../Crypto/RealmCrypt.h" #include "../Crypto/RealmCrypt.hpp"
class ByteBuffer { class ByteBuffer {
public: public:

View File

@@ -4,7 +4,7 @@
#include <vector> #include <vector>
#include <span> #include <span>
#include "rijndael.h" #include "rijndael.hpp"
// This class is based on the games Encryptor class, // This class is based on the games Encryptor class,
// and is a wrapper around the rijndael ECB implementation. // and is a wrapper around the rijndael ECB implementation.

View File

@@ -8,9 +8,9 @@
#include <map> #include <map>
#include <sqlite3.h> #include <sqlite3.h>
#include "Transaction.h" #include "Transaction.hpp"
#include "../../Game/RealmCharacter.h" #include "Game/RealmCharacter.hpp"
#include "../../Game/RealmCharacterMetaKV.h" #include "Game/RealmCharacterMetaKV.hpp"
enum class QueryID { enum class QueryID {
CreateAccount, CreateAccount,
@@ -35,7 +35,6 @@ class Database {
private: private:
static inline std::unique_ptr<Database> m_instance; static inline std::unique_ptr<Database> m_instance;
static inline std::mutex m_mutex; static inline std::mutex m_mutex;
static inline std::chrono::time_point< std::chrono::steady_clock > m_lastMaintenance;
sqlite3 *m_db = nullptr; sqlite3 *m_db = nullptr;
std::unordered_map< QueryID, sqlite3_stmt * > m_statements; std::unordered_map< QueryID, sqlite3_stmt * > m_statements;
@@ -55,8 +54,6 @@ public:
Database(); Database();
~Database(); ~Database();
void Process();
public: public:
int64_t CreateNewAccount( const std::string &username, int64_t CreateNewAccount( const std::string &username,
const std::string &password, const std::string &password,

View File

@@ -9,7 +9,7 @@
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
class DiscoveryServer { class DiscoveryServer {
public: public:

View File

@@ -4,7 +4,7 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "CharacterSaveTask.h" #include "CharacterSaveTask.hpp"
class CharacterSaveManager { class CharacterSaveManager {
public: public:

View File

@@ -5,10 +5,10 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "../Common/Constant.h" #include "Common/Constant.hpp"
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
#include "RealmUser.h" #include "RealmUser.hpp"
#include "RealmCharacterMetaKV.h" #include "RealmCharacterMetaKV.hpp"
enum class CharacterSaveType : uint8_t enum class CharacterSaveType : uint8_t
{ {

View File

@@ -5,7 +5,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include "ChatRoomSession.h" #include "ChatRoomSession.hpp"
class ChatRoomManager { class ChatRoomManager {
private: private:

View File

@@ -4,7 +4,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "RealmUser.h" #include "RealmUser.hpp"
class ChatRoomSession { class ChatRoomSession {
public: public:

View File

@@ -5,7 +5,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include "RealmUser.h" #include "RealmUser.hpp"
class GameSession { class GameSession {
public: public:

View File

@@ -4,9 +4,9 @@
#include <mutex> #include <mutex>
#include <vector> #include <vector>
#include "GameSession.h" #include "GameSession.hpp"
#include "../Common/Constant.h" #include "Common/Constant.hpp"
class GameSessionManager { class GameSessionManager {
private: private:

View File

@@ -5,9 +5,9 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "../Common/Constant.h" #include "Common/Constant.hpp"
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
#include "RealmCharacterMetaKV.h" #include "RealmCharacterMetaKV.hpp"
constexpr size_t MAX_NUMBER_OF_CHARACTERS = 12; constexpr size_t MAX_NUMBER_OF_CHARACTERS = 12;
constexpr size_t CHARACTER_DATA_SIZE = 19504; constexpr size_t CHARACTER_DATA_SIZE = 19504;

View File

@@ -4,7 +4,7 @@
#include <vector> #include <vector>
#include <utility> #include <utility>
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
using CharacterAttributeKV = std::pair<std::wstring, std::wstring>; using CharacterAttributeKV = std::pair<std::wstring, std::wstring>;

View File

@@ -4,10 +4,10 @@
#include <memory> #include <memory>
#include <array> #include <array>
#include "RealmCharacter.h" #include "RealmCharacter.hpp"
#include "../Common/Constant.h" #include "Common/Constant.hpp"
#include "../Network/RealmSocket.h" #include "../Network/RealmSocket.hpp"
class RealmUser { class RealmUser {
public: public:

View File

@@ -6,7 +6,7 @@
#include <string> #include <string>
#include <random> #include <random>
#include "RealmUser.h" #include "RealmUser.hpp"
class UserManager { class UserManager {
private: private:

View File

@@ -11,9 +11,9 @@
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include "../Common/Constant.h" #include "Common/Constant.hpp"
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
#include "../Network/RealmSocket.h" #include "../Network/RealmSocket.hpp"
class LobbyServer class LobbyServer
{ {

View File

@@ -2,8 +2,8 @@
#include <string> #include <string>
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class NotifyClientDiscovered : public GenericMessage { class NotifyClientDiscovered : public GenericMessage {
private: private:

View File

@@ -2,9 +2,9 @@
#include <string> #include <string>
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
#include "../../Common/Constant.h" #include "Common/Constant.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class NotifyClientDiscovered_RTA : public GenericMessage { class NotifyClientDiscovered_RTA : public GenericMessage {
private: private:

View File

@@ -2,8 +2,8 @@
#include <string> #include <string>
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class NotifyClientRequestConnect : public GenericMessage { class NotifyClientRequestConnect : public GenericMessage {
private: private:

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class NotifyClientRequestConnect_RTA : public GenericMessage { class NotifyClientRequestConnect_RTA : public GenericMessage {
private: private:

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
class NotifyForcedLogout : public GenericMessage { class NotifyForcedLogout : public GenericMessage {
private: private:

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
class NotifyFriendStatus : public GenericMessage { class NotifyFriendStatus : public GenericMessage {
private: private:

View File

@@ -3,9 +3,9 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
#include "../../Common/Constant.h" #include "Common/Constant.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class NotifyGameDiscovered : public GenericMessage { class NotifyGameDiscovered : public GenericMessage {
private: private:

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
class NotifyInstantMessage : public GenericMessage { class NotifyInstantMessage : public GenericMessage {
private: private:

View File

@@ -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;
};

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../GenericNetMessage.h" #include "../GenericNetMessage.hpp"
class NotifyRoomMessage : public GenericMessage { class NotifyRoomMessage : public GenericMessage {
private: private:

View File

@@ -0,0 +1,11 @@
#pragma once
#include "../GenericNetMessage.h"
class Notify_4C : public GenericMessage {
private:
public:
Notify_4C();
void Serialize(ByteBuffer &out) const override;
};

View File

@@ -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;
};

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestAddFriend : public GenericRequest class RequestAddFriend : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestAddIgnore : public GenericRequest class RequestAddIgnore : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestAppendCharacterData : public GenericRequest class RequestAppendCharacterData : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCancelGame : public GenericRequest class RequestCancelGame : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCancelGame_RTA : public GenericRequest class RequestCancelGame_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCreateAccount : public GenericRequest class RequestCreateAccount : public GenericRequest
{ {

View File

@@ -1,9 +1,9 @@
#pragma once #pragma once
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/RealmCharacter.h" #include "Game/RealmCharacter.hpp"
class RequestCreateNewCharacter_RTA : public GenericRequest class RequestCreateNewCharacter_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCreatePrivateGame : public GenericRequest class RequestCreatePrivateGame : public GenericRequest
{ {

View File

@@ -4,8 +4,8 @@
#include <string> #include <string>
#include <array> #include <array>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCreatePrivateGame_RTA : public GenericRequest class RequestCreatePrivateGame_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCreatePrivateRoom : public GenericRequest class RequestCreatePrivateRoom : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCreatePublicGame : public GenericRequest class RequestCreatePublicGame : public GenericRequest
{ {

View File

@@ -4,8 +4,8 @@
#include <string> #include <string>
#include <array> #include <array>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestCreatePublicGame_RTA : public GenericRequest class RequestCreatePublicGame_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestDoClientDiscovery : public GenericRequest class RequestDoClientDiscovery : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestDoClientDiscovery_RTA : public GenericRequest { class RequestDoClientDiscovery_RTA : public GenericRequest {
private: private:

View File

@@ -3,10 +3,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/ChatRoomSession.h" #include "Game/ChatRoomSession.hpp"
class RequestEnterRoom : public GenericRequest class RequestEnterRoom : public GenericRequest
{ {

View File

@@ -3,10 +3,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/RealmCharacter.h" #include "Game/RealmCharacter.hpp"
class RequestGetNetCharacterData_RTA : public GenericRequest class RequestGetNetCharacterData_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestGetEncryptionKey : public GenericRequest class RequestGetEncryptionKey : public GenericRequest
{ {

View File

@@ -0,0 +1,25 @@
#pragma once
#include <memory>
#include <string>
#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;
};

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestGetGame : public GenericRequest { class RequestGetGame : public GenericRequest {
private: private:

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestGetGame_RTA : public GenericRequest { class RequestGetGame_RTA : public GenericRequest {
private: private:

View File

@@ -5,9 +5,9 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/RealmCharacterMetaKV.h" #include "Game/RealmCharacterMetaKV.hpp"
class RequestGetNetCharacterList_RTA : public GenericRequest class RequestGetNetCharacterList_RTA : public GenericRequest
{ {

View File

@@ -3,10 +3,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/ChatRoomSession.h" #include "Game/ChatRoomSession.hpp"
class RequestGetPublicRooms : public GenericRequest class RequestGetPublicRooms : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestGetRealmStats : public GenericRequest class RequestGetRealmStats : public GenericRequest
{ {

View File

@@ -3,10 +3,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/ChatRoomSession.h" #include "Game/ChatRoomSession.hpp"
class RequestGetRoom : public GenericRequest { class RequestGetRoom : public GenericRequest {
private: private:

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestGetRules : public GenericRequest class RequestGetRules : public GenericRequest
{ {

View File

@@ -3,9 +3,9 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Common/Constant.h" #include "Common/Constant.hpp"
class RequestGetServerAddress : public GenericRequest { class RequestGetServerAddress : public GenericRequest {
public: public:

View File

@@ -3,9 +3,9 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class RequestGetSocialListInitial : public GenericRequest class RequestGetSocialListInitial : public GenericRequest
{ {

View File

@@ -3,9 +3,9 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Common/ForwardDecl.h" #include "Common/ForwardDecl.hpp"
class RequestGetSocialListUpdate : public GenericRequest class RequestGetSocialListUpdate : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestLeaveRoom : public GenericRequest class RequestLeaveRoom : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestLogin : public GenericRequest class RequestLogin : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestLogout : public GenericRequest class RequestLogout : public GenericRequest
{ {

View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestMatchGame : public GenericRequest class RequestMatchGame : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestMatchGame_RTA : public GenericRequest class RequestMatchGame_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestRemoveFriend : public GenericRequest class RequestRemoveFriend : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestRemoveIgnore : public GenericRequest class RequestRemoveIgnore : public GenericRequest
{ {

View File

@@ -1,9 +1,9 @@
#pragma once #pragma once
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/RealmCharacter.h" #include "Game/RealmCharacter.hpp"
class RequestSaveCharacter_RTA : public GenericRequest class RequestSaveCharacter_RTA : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestSendInstantMessage : public GenericRequest class RequestSendInstantMessage : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestSendRoomMessage : public GenericRequest class RequestSendRoomMessage : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestStartGame : public GenericRequest class RequestStartGame : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestTouchSession : public GenericRequest class RequestTouchSession : public GenericRequest
{ {

View File

@@ -3,10 +3,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
#include "../../Game/GameSession.h" #include "Game/GameSession.hpp"
class RequestUpdateGameData : public GenericRequest class RequestUpdateGameData : public GenericRequest
{ {

View File

@@ -3,8 +3,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "../GenericNetRequest.h" #include "../GenericNetRequest.hpp"
#include "../GenericNetResponse.h" #include "../GenericNetResponse.hpp"
class RequestUserJoinSuccess : public GenericRequest class RequestUserJoinSuccess : public GenericRequest
{ {

View File

@@ -0,0 +1,37 @@
#pragma once
#include <memory>
#include <string>
#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();
};

View File

@@ -0,0 +1,25 @@
#pragma once
#include <memory>
#include <string>
#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();
};

View File

@@ -3,60 +3,60 @@
#include <map> #include <map>
#include <functional> #include <functional>
/* 0001 */ #include "Event/RequestAddFriend.h" /* 0001 */ #include "Event/RequestAddFriend.hpp"
/* 0002 */ #include "Event/RequestAddIgnore.h" /* 0002 */ #include "Event/RequestAddIgnore.hpp"
/* 0005 */ #include "Event/RequestCancelGame.h" /* 0005 */ #include "Event/RequestCancelGame.hpp"
/* 0006 */ #include "Event/RequestCreateAccount.h" /* 0006 */ #include "Event/RequestCreateAccount.hpp"
/* 0008 */ #include "Event/RequestCreatePrivateGame.h" /* 0008 */ #include "Event/RequestCreatePrivateGame.hpp"
/* 0009 */ #include "Event/RequestCreatePrivateRoom.h" /* 0009 */ #include "Event/RequestCreatePrivateRoom.hpp"
/* 000A */ #include "Event/RequestCreatePublicGame.h" /* 000A */ #include "Event/RequestCreatePublicGame.hpp"
/* 000C */ #include "Event/RequestEnterRoom.h" /* 000C */ #include "Event/RequestEnterRoom.hpp"
/* 000D */ #include "Event/RequestGetGame.h" /* 000D */ #include "Event/RequestGetGame.hpp"
/* 000E */ #include "Event/RequestGetPublicRooms.h" /* 000E */ #include "Event/RequestGetPublicRooms.hpp"
/* 000F */ #include "Event/RequestGetRealmStats.h" /* 000F */ #include "Event/RequestGetRealmStats.hpp"
/* 0011 */ #include "Event/RequestGetRoom.h" /* 0011 */ #include "Event/RequestGetRoom.hpp"
/* 0015 */ #include "Event/RequestLeaveRoom.h" /* 0015 */ #include "Event/RequestLeaveRoom.hpp"
/* 0016 */ #include "Event/RequestLogin.h" /* 0016 */ #include "Event/RequestLogin.hpp"
/* 0017 */ #include "Event/RequestLogout.h" /* 0017 */ #include "Event/RequestLogout.hpp"
/* 0018 */ #include "Event/RequestMatchGame.h" /* 0018 */ #include "Event/RequestMatchGame.hpp"
/* 001C */ #include "Event/RequestRemoveFriend.h" /* 001C */ #include "Event/RequestRemoveFriend.hpp"
/* 001D */ #include "Event/RequestRemoveIgnore.h" /* 001D */ #include "Event/RequestRemoveIgnore.hpp"
/* 0021 */ #include "Event/RequestSendInstantMessage.h" /* 0021 */ #include "Event/RequestSendInstantMessage.hpp"
/* 0022 */ #include "Event/RequestSendRoomMessage.h" /* 0022 */ #include "Event/RequestSendRoomMessage.hpp"
/* 0023 */ #include "Event/RequestStartGame.h" /* 0023 */ #include "Event/RequestStartGame.hpp"
/* 0024 */ #include "Event/RequestTouchSession.h" /* 0024 */ #include "Event/RequestTouchSession.hpp"
/* 0025 */ #include "Event/RequestDoClientDiscovery.h" /* 0025 */ #include "Event/RequestDoClientDiscovery.hpp"
/* 0027 */ #include "Event/RequestGetEncryptionKey.h" /* 0027 */ #include "Event/RequestGetEncryptionKey.hpp"
/* 0041 */ #include "Event/NotifyForcedLogout.h" /* 0041 */ #include "Event/NotifyForcedLogout.hpp"
/* 0042 */ #include "Event/RequestGetRules.h" /* 0042 */ #include "Event/RequestGetRules.hpp"
/* 0043 */ #include "Event/RequestGetServerAddress.h" /* 0043 */ #include "Event/RequestGetServerAddress.hpp"
/* 0044 */ #include "Event/RequestUpdateGameData.h" /* 0044 */ #include "Event/RequestUpdateGameData.hpp"
/* 0054 */ #include "Event/RequestCreatePublicGame_RTA.h" /* 0054 */ #include "Event/RequestCreatePublicGame_RTA.hpp"
/* 0055 */ #include "Event/RequestMatchGame_RTA.h" /* 0055 */ #include "Event/RequestMatchGame_RTA.hpp"
/* 0056 */ #include "Event/RequestCreatePrivateGame_RTA.h" /* 0056 */ #include "Event/RequestCreatePrivateGame_RTA.hpp"
/* 0057 */ #include "Event/RequestGetGame_RTA.h" /* 0057 */ #include "Event/RequestGetGame_RTA.hpp"
/* 0058 */ #include "Event/RequestCreateNewCharacter_RTA.h" /* 0058 */ #include "Event/RequestCreateNewCharacter_RTA.hpp"
/* 005B */ #include "Event/RequestGetNetCharacterList_RTA.h" /* 005B */ #include "Event/RequestGetNetCharacterList_RTA.hpp"
/* 005C */ #include "Event/RequestGetCharacterData_RTA.h" /* 005C */ #include "Event/RequestGetCharacterData_RTA.hpp"
/* 005D */ #include "Event/RequestAppendCharacterData.h" /* 005D */ #include "Event/RequestAppendCharacterData.hpp"
/* 005E */ #include "Event/RequestSaveCharacter_RTA.h" /* 005E */ #include "Event/RequestSaveCharacter_RTA.hpp"
/* 005F */ #include "Event/RequestUserJoinSuccess.h" /* 005F */ #include "Event/RequestUserJoinSuccess.hpp"
/* 0060 */ #include "Event/RequestCancelGame_RTA.h" /* 0060 */ #include "Event/RequestCancelGame_RTA.hpp"
/* 0061 */ #include "Event/RequestGetSocialListInitial.h" /* 0061 */ #include "Event/RequestGetSocialListInitial.hpp"
/* 0062 */ #include "Event/RequestGetSocialListUpdate.h" /* 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 = const std::map< int16_t, std::function< std::unique_ptr< GenericRequest >() > > REQUEST_EVENT =

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
class GenericMessage class GenericMessage
{ {

View File

@@ -2,7 +2,7 @@
#include <memory> #include <memory>
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
class GenericResponse; class GenericResponse;
using sptr_generic_response = std::shared_ptr< GenericResponse >; using sptr_generic_response = std::shared_ptr< GenericResponse >;

View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "GenericNetRequest.h" #include "GenericNetRequest.hpp"
#include "../Common/ByteStream.h" #include "Common/ByteStream.hpp"
class GenericResponse class GenericResponse
{ {

View File

@@ -5,10 +5,10 @@
#include <mutex> #include <mutex>
#include <winsock2.h> #include <winsock2.h>
#include "GenericNetRequest.h" #include "GenericNetRequest.hpp"
#include "GenericNetResponse.h" #include "GenericNetResponse.hpp"
#include "GenericNetMessage.h" #include "GenericNetMessage.hpp"
#include "../Common/Constant.h" #include "Common/Constant.hpp"
class RealmSocket class RealmSocket
{ {

View File

@@ -103,7 +103,9 @@ public:
template<typename... Args> template<typename... Args>
static void Debug( const std::string &format, Args&&... args ) static void Debug( const std::string &format, Args&&... args )
{ {
#ifdef _DEBUG
WriteToLog( log_debug, Format( format, std::forward<Args>( args )... ) ); WriteToLog( log_debug, Format( format, std::forward<Args>( args )... ) );
#endif
} }
template<typename... Args> template<typename... Args>

View File

@@ -1 +0,0 @@
#include "GenericNetRequest.h"

View File

@@ -1,5 +1,6 @@
#include "Common/ByteStream.hpp"
#include <codecvt> #include <codecvt>
#include "ByteStream.h"
#include <span> #include <span>
ByteBuffer::ByteBuffer( const std::vector< uint8_t > &data ) ByteBuffer::ByteBuffer( const std::vector< uint8_t > &data )

View File

@@ -6,7 +6,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <windows.h> #include <windows.h>
#include "Utility.h" #include "Common/Utility.hpp"
int32_t Util::round_up( int32_t numToRound, int32_t multiple ) int32_t Util::round_up( int32_t numToRound, int32_t multiple )
{ {

View File

@@ -3,7 +3,7 @@
#include <iomanip> #include <iomanip>
#include <stdexcept> #include <stdexcept>
#include "PasswordHash.h" #include "Crypto/PasswordHash.hpp"
std::string HexDump( const std::vector<uint8_t> &bytes ) std::string HexDump( const std::vector<uint8_t> &bytes )
{ {

View File

@@ -1,6 +1,6 @@
#include "RealmCrypt.h" #include "Crypto/RealmCrypt.hpp"
#include "../Common/Utility.h" #include "Common/Utility.hpp"
RealmCrypt::RealmCrypt() RealmCrypt::RealmCrypt()
{ {

View File

@@ -1,4 +1,4 @@
#include "rijndael.h" #include "Crypto/rijndael.hpp"
rijndael::rijndael() rijndael::rijndael()
{ {

View File

@@ -1,18 +1,35 @@
#include "Database.h" #include "Database/Database.hpp"
#include "../../Crypto/PasswordHash.h" #include "Crypto/PasswordHash.hpp"
#include "../../Game/RealmCharacter.h" #include "Game/RealmCharacter.hpp"
#include "../../Game/RealmCharacterMetaKV.h" #include "Game/RealmCharacterMetaKV.hpp"
#include "../logging.h" #include "logging.hpp"
#include <filesystem>
namespace fs = std::filesystem;
Database::Database() 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(); CreateTables();
PrepareStatements(); PrepareStatements();
@@ -25,17 +42,6 @@ Database::~Database()
sqlite3_close( m_db ); 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() void Database::CreateTables()
{ {
Execute( "CREATE TABLE IF NOT EXISTS RealmUsers (" Execute( "CREATE TABLE IF NOT EXISTS RealmUsers ("
@@ -196,7 +202,7 @@ int64_t Database::CreateNewAccount( const std::string &username,
} }
catch( const std::exception &e ) 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; return 0;
@@ -231,7 +237,7 @@ Database::VerifyAccount( const std::wstring &username, const std::wstring &passw
} }
else else
{ {
Log::Error( "Invalid credentials for account ID: {}", accountId ); Log::Debug( "Invalid credentials for account ID: {}", accountId );
return std::make_tuple( false, -1, L"" ); return std::make_tuple( false, -1, L"" );
} }
} }

Some files were not shown because too many files have changed in this diff Show More