pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Loginserver Error String Constants. (#1747)

Browse Source 
- Constant was named after Windows macro.
This commit is contained in:
Kinglykrab 2021-11-13 02:00:45 -05:00 committed by GitHub
parent a9d1034298
commit 9c55cf9a8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
loginserver/login_types.h
View File

@ -129,13 +129,13 @@ namespace LS {
}; };
namespace ErrStr { namespace ErrStr {
constexpr static int NO_ERROR = 101; // No Error constexpr static int ERROR_NONE = 101; // No Error
constexpr static int SERVER_UNAVAILABLE = 326; // That server is currently unavailable. Please check the EverQuest webpage for current server status and try again later. constexpr static int ERROR_UNKNOWN = 102; // Error - Unknown Error Occurred
constexpr static int ACCOUNT_SUSPENDED = 337; // This account is currently suspended. Please contact customer service for more information. constexpr static int ERROR_ACTIVE_CHARACTER = 111; // Error 1018: You currently have an active character on that EverQuest Server, please allow a minute for synchronization and try again.
constexpr static int ACCOUNT_BANNED = 338; // This account is currently banned. Please contact customer service for more information. constexpr static int ERROR_SERVER_UNAVAILABLE = 326; // That server is currently unavailable. Please check the EverQuest webpage for current server status and try again later.
constexpr static int WORLD_MAX_CAPACITY = 339; // The world server is currently at maximum capacity and not allowing further logins until the number of players online decreases. Please try again later. constexpr static int ERROR_ACCOUNT_SUSPENDED = 337; // This account is currently suspended. Please contact customer service for more information.
constexpr static int ERROR_1018_ACTIVE_CHARACTER = 111; // Error 1018: You currently have an active character on that EverQuest Server, please allow a minute for synchronization and try again. constexpr static int ERROR_ACCOUNT_BANNED = 338; // This account is currently banned. Please contact customer service for more information.
constexpr static int UNKNOWN_ERROR = 102; // Error - Unknown Error Occurred constexpr static int ERROR_WORLD_MAX_CAPACITY = 339; // The world server is currently at maximum capacity and not allowing further logins until the number of players online decreases. Please try again later.
}; };
} }

30
loginserver/world_server.cpp
View File

@ -232,25 +232,26 @@ void WorldServer::ProcessUserToWorldResponseLegacy(uint16_t opcode, const EQ::Ne
switch (r->response) { switch (r->response) {
case UserToWorldStatusSuccess: case UserToWorldStatusSuccess:
per->base_reply.error_str_id = LS::ErrStr::NO_ERROR; per->base_reply.error_str_id = LS::ErrStr::ERROR_NONE;
break; break;
case UserToWorldStatusWorldUnavail: case UserToWorldStatusWorldUnavail:
per->base_reply.error_str_id = LS::ErrStr::SERVER_UNAVAILABLE; per->base_reply.error_str_id = LS::ErrStr::ERROR_SERVER_UNAVAILABLE;
break; break;
case UserToWorldStatusSuspended: case UserToWorldStatusSuspended:
per->base_reply.error_str_id = LS::ErrStr::ACCOUNT_SUSPENDED; per->base_reply.error_str_id = LS::ErrStr::ERROR_ACCOUNT_SUSPENDED;
break; break;
case UserToWorldStatusBanned: case UserToWorldStatusBanned:
per->base_reply.error_str_id = LS::ErrStr::ACCOUNT_BANNED; per->base_reply.error_str_id = LS::ErrStr::ERROR_ACCOUNT_BANNED;
break; break;
case UserToWorldStatusWorldAtCapacity: case UserToWorldStatusWorldAtCapacity:
per->base_reply.error_str_id = LS::ErrStr::WORLD_MAX_CAPACITY; per->base_reply.error_str_id = LS::ErrStr::ERROR_WORLD_MAX_CAPACITY;
break; break;
case UserToWorldStatusAlreadyOnline: case UserToWorldStatusAlreadyOnline:
per->base_reply.error_str_id = LS::ErrStr::ERROR_1018_ACTIVE_CHARACTER; per->base_reply.error_str_id = LS::ErrStr::ERROR_ACTIVE_CHARACTER;
break; break;
default: default:
per->base_reply.error_str_id = LS::ErrStr::UNKNOWN_ERROR; per->base_reply.error_str_id = LS::ErrStr::ERROR_UNKNOWN;
break;
} }
if (server.options.IsWorldTraceOn()) { if (server.options.IsWorldTraceOn()) {
@ -358,25 +359,26 @@ void WorldServer::ProcessUserToWorldResponse(uint16_t opcode, const EQ::Net::Pac
switch (user_to_world_response->response) { switch (user_to_world_response->response) {
case UserToWorldStatusSuccess: case UserToWorldStatusSuccess:
per->base_reply.error_str_id = LS::ErrStr::NO_ERROR; per->base_reply.error_str_id = LS::ErrStr::ERROR_NONE;
break; break;
case UserToWorldStatusWorldUnavail: case UserToWorldStatusWorldUnavail:
per->base_reply.error_str_id = LS::ErrStr::SERVER_UNAVAILABLE; per->base_reply.error_str_id = LS::ErrStr::ERROR_SERVER_UNAVAILABLE;
break; break;
case UserToWorldStatusSuspended: case UserToWorldStatusSuspended:
per->base_reply.error_str_id = LS::ErrStr::ACCOUNT_SUSPENDED; per->base_reply.error_str_id = LS::ErrStr::ERROR_ACCOUNT_SUSPENDED;
break; break;
case UserToWorldStatusBanned: case UserToWorldStatusBanned:
per->base_reply.error_str_id = LS::ErrStr::ACCOUNT_BANNED; per->base_reply.error_str_id = LS::ErrStr::ERROR_ACCOUNT_BANNED;
break; break;
case UserToWorldStatusWorldAtCapacity: case UserToWorldStatusWorldAtCapacity:
per->base_reply.error_str_id = LS::ErrStr::WORLD_MAX_CAPACITY; per->base_reply.error_str_id = LS::ErrStr::ERROR_WORLD_MAX_CAPACITY;
break; break;
case UserToWorldStatusAlreadyOnline: case UserToWorldStatusAlreadyOnline:
per->base_reply.error_str_id = LS::ErrStr::ERROR_1018_ACTIVE_CHARACTER; per->base_reply.error_str_id = LS::ErrStr::ERROR_ACTIVE_CHARACTER;
break; break;
default: default:
per->base_reply.error_str_id = LS::ErrStr::UNKNOWN_ERROR; per->base_reply.error_str_id = LS::ErrStr::ERROR_UNKNOWN;
break;
} }
if (server.options.IsTraceOn()) { if (server.options.IsTraceOn()) {