RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 08:12:44 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(glue): handle errors with urls in CGlueMgr::PollAccountLogin

Browse Source
This commit is contained in:
fallenoak 2025-10-09 00:18:41 -05:00
parent e1a14f8550
commit 1b6bcdc59c
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/glue/CGlueMgr.cpp
View File

@ -74,6 +74,11 @@ int32_t CGlueMgr::m_showedDisconnect;
CSimpleTop* CGlueMgr::m_simpleTop; CSimpleTop* CGlueMgr::m_simpleTop;
int32_t CGlueMgr::m_suspended; int32_t CGlueMgr::m_suspended;
struct URLERROR {
int32_t error;
char url[32];
};
float CalculateAspectRatio() { float CalculateAspectRatio() {
auto widescreenVar = CVar::Lookup("widescreen"); auto widescreenVar = CVar::Lookup("widescreen");
auto resolutionVar = CVar::Lookup("gxResolution"); auto resolutionVar = CVar::Lookup("gxResolution");
@ -492,6 +497,14 @@ int32_t CGlueMgr::OnKickReasonMsg(void* param, NETMESSAGE msgId, uint32_t time,
} }
void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t complete, int32_t result, WOWCS_OPS op) { void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t complete, int32_t result, WOWCS_OPS op) {
static URLERROR s_urlErrors[] = {
{ 28, "AUTH_BANNED_URL" },
{ 31, "AUTH_DB_BUSY_URL" },
{ 30, "AUTH_NO_TIME_URL" },
{ 32, "AUTH_SUSPENDED_URL" },
{ 33, "AUTH_PARENTAL_CONTROL_URL" }
};
auto login = ClientServices::LoginConnection(); auto login = ClientServices::LoginConnection();
if (login->GetLoginServerType() == 1 && CGlueMgr::m_loginState == LOGIN_STATE_FAILED) { if (login->GetLoginServerType() == 1 && CGlueMgr::m_loginState == LOGIN_STATE_FAILED) {
@ -524,7 +537,20 @@ void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t comp
if (result == 0) { if (result == 0) {
if (errorCode != 2) { if (errorCode != 2) {
// TODO URLERROR* urlError = nullptr;
for (auto& ue : s_urlErrors) {
if (errorCode == ue.error) {
urlError = &ue;
break;
}
}
if (urlError) {
FrameScript_SignalEvent(OPEN_STATUS_DIALOG,"%s%s%s", "OKAY_WITH_URL", urlError->url);
} else {
FrameScript_SignalEvent(OPEN_STATUS_DIALOG, "%s%s", "OKAY", msg);
}
} }
CGlueMgr::SetIdleState(IDLE_NONE); CGlueMgr::SetIdleState(IDLE_NONE);