mosskoi/Champions-Reborn-Server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup some variables

Browse Source
This commit is contained in:
HikikoMarmy
2025-07-17 21:46:29 +01:00
parent f26aedfcd2
commit 849c198da2
14 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Network/Event/RequestAppendCharacterData.h
View File

@@ -12,7 +12,7 @@ private:
std::vector< uint8_t > m_data;
int32_t m_endOfData;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestCreateNewCharacter_RTA.h
View File

@@ -12,7 +12,7 @@ private:
CharacterSlotData m_metaData;
std::vector< uint8_t > m_characterData;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestCreatePrivateGame.h
View File

@@ -12,7 +12,7 @@ private:
std::wstring m_sessionId;
std::wstring m_gameName;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

6
Network/Event/RequestCreatePrivateGame_RTA.cpp
View File

@@ -25,14 +25,14 @@ sptr_generic_response RequestCreatePrivateGame_RTA::ProcessRequest( sptr_socket
if( user == nullptr )
{
Log::Error( "User not found! [{}]", m_sessionId );
return std::make_shared< ResultCreatePrivateGame_RTA >( this, CREATE_REPLY::FATAL_ERROR, "", 0 );
return std::make_shared< ResultCreatePrivateGame_RTA >( this, FATAL_ERROR, "", 0 );
}
auto result = GameSessionManager::Get().CreateGameSession_RTA( user, L"", m_gameName, {}, true);
if( !result )
{
Log::Error( "RequestCreatePrivateGame2::ProcessRequest() - Failed to create private game session!" );
return std::make_shared< ResultCreatePrivateGame_RTA >( this, CREATE_REPLY::GENERAL_ERROR, "", 0 );
return std::make_shared< ResultCreatePrivateGame_RTA >( this, GENERAL_ERROR, "", 0 );
}
user->m_localAddr = m_localAddr;
@@ -40,7 +40,7 @@ sptr_generic_response RequestCreatePrivateGame_RTA::ProcessRequest( sptr_socket
Log::Info( "[{}] Create Private Game: {}", m_sessionId, m_gameName );
return std::make_shared< ResultCreatePrivateGame_RTA >( this, CREATE_REPLY::SUCCESS, Config::service_ip, Config::discovery_port );
return std::make_shared< ResultCreatePrivateGame_RTA >( this, SUCCESS, Config::service_ip, Config::discovery_port );
}
ResultCreatePrivateGame_RTA::ResultCreatePrivateGame_RTA( GenericRequest *request, int32_t reply, std::string discoveryIp, int32_t discoveryPort ) : GenericResponse( *request )

2
Network/Event/RequestCreatePrivateGame_RTA.h
View File

@@ -15,7 +15,7 @@ private:
std::string m_localAddr;
int32_t m_localPort;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestCreatePublicGame.h
View File

@@ -17,7 +17,7 @@ private:
int32_t m_minimumLevel;
int32_t m_maximumLevel;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

6
Network/Event/RequestCreatePublicGame_RTA.cpp
View File

@@ -77,14 +77,14 @@ sptr_generic_response RequestCreatePublicGame_RTA::ProcessRequest( sptr_socket s
if( user == nullptr )
{
Log::Error( "User not found! [{}]", m_sessionId );
return std::make_shared< ResultCreatePublicGame_RTA >( this, CREATE_REPLY::GENERAL_ERROR, "", 0 );
return std::make_shared< ResultCreatePublicGame_RTA >( this, GENERAL_ERROR, "", 0 );
}
auto result = GameSessionManager::Get().CreateGameSession_RTA( user, m_gameInfo, m_gameName, m_attributes, false );
if( !result )
{
Log::Error( "RequestCreatePublicGame::ProcessRequest() - Failed to create public game session!" );
return std::make_shared< ResultCreatePublicGame_RTA >( this, CREATE_REPLY::GENERAL_ERROR, "", 0 );
return std::make_shared< ResultCreatePublicGame_RTA >( this, GENERAL_ERROR, "", 0 );
}
user->m_localAddr = m_localAddr;
@@ -92,7 +92,7 @@ sptr_generic_response RequestCreatePublicGame_RTA::ProcessRequest( sptr_socket s
Log::Info( "[{}] Create Public Game: {}", user->m_username, m_gameInfo );
return std::make_shared< ResultCreatePublicGame_RTA >( this, CREATE_REPLY::SUCCESS, Config::service_ip, Config::discovery_port );
return std::make_shared< ResultCreatePublicGame_RTA >( this, SUCCESS, Config::service_ip, Config::discovery_port );
}
// Result

2
Network/Event/RequestCreatePublicGame_RTA.h
View File

@@ -18,7 +18,7 @@ private:
std::array< int8_t, 5 > m_attributes;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestGetCharacterData_RTA.h
View File

@@ -13,7 +13,7 @@ class RequestGetNetCharacterData_RTA : public GenericRequest
private:
int32_t m_characterId;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestGetNetCharacterList_RTA.h
View File

@@ -12,7 +12,7 @@
class RequestGetNetCharacterList_RTA : public GenericRequest
{
private:
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

11
Network/Event/RequestSaveCharacter_RTA.cpp
View File

@@ -35,16 +35,7 @@ sptr_generic_response RequestSaveCharacter_RTA::ProcessRequest( sptr_socket sock
auto user = userManager.FindUserBySocket( socket );
if( user == nullptr || user->m_accountId == -1 )
{
// Try to recover the user through session records.
user = UserManager::Get().RecoverUserBySession( m_sessionId, socket );
if( user == nullptr )
{
Log::Error( "Failed to recover user by session ID: {}", m_sessionId );
return std::make_shared< ResultSaveCharacter_RTA >( this, FATAL_ERROR );
}
Log::Debug( "Recovered user by session ID: {}", m_sessionId );
return std::make_shared< ResultSaveCharacter_RTA >( this, FATAL_ERROR );
}
sptr_user targetUser = user;

2
Network/Event/RequestSaveCharacter_RTA.h
View File

@@ -15,7 +15,7 @@ private:
CharacterSlotData m_metaData;
std::vector< uint8_t > m_characterData;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestStartGame.h
View File

@@ -11,7 +11,7 @@ class RequestStartGame : public GenericRequest
private:
std::vector< uint8_t > m_data;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,

2
Network/Event/RequestUserJoinSuccess.h
View File

@@ -12,7 +12,7 @@ private:
std::wstring m_sessionId;
std::wstring m_ownerSessionId;
enum CREATE_REPLY {
enum ERROR_CODE {
SUCCESS = 0,
FATAL_ERROR,
GENERAL_ERROR,