AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-11 16:45:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

For auto join server hash, also try to automatically sign in the user too

Browse Source
This commit is contained in:
UnknownShadow200 2020-07-31 12:07:24 +10:00
parent 0da489e82a
commit 4534e647e9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/LScreens.c
View File

@ -166,7 +166,7 @@ CC_NOINLINE static void LScreen_Reset(struct LScreen* s) {
int i; int i;
s->Init = NULL; /* screens should always override this */ s->Init = NULL; /* screens should always override this */
s->Show = NULL; /* screens should always override this */ s->Show = LScreen_NullFunc;
s->Free = LScreen_NullFunc; s->Free = LScreen_NullFunc;
s->Draw = LScreen_Draw; s->Draw = LScreen_Draw;
s->Tick = LScreen_Tick; s->Tick = LScreen_Tick;
@ -598,7 +598,6 @@ void DirectConnectScreen_SetActive(void) {
struct DirectConnectScreen* s = &DirectConnectScreen_Instance; struct DirectConnectScreen* s = &DirectConnectScreen_Instance;
LScreen_Reset((struct LScreen*)s); LScreen_Reset((struct LScreen*)s);
s->Init = DirectConnectScreen_Init; s->Init = DirectConnectScreen_Init;
s->Show = LScreen_NullFunc;
s->Layout = DirectConnectScreen_Layout; s->Layout = DirectConnectScreen_Layout;
s->onEnterWidget = (struct LWidget*)&s->btnConnect; s->onEnterWidget = (struct LWidget*)&s->btnConnect;
Launcher_SetScreen((struct LScreen*)s); Launcher_SetScreen((struct LScreen*)s);
@ -655,7 +654,7 @@ CC_NOINLINE static void MainScreen_Error(struct LWebTask* task, const char* acti
s->signingIn = false; s->signingIn = false;
} }
static void MainScreen_Login(void* w, int x, int y) { static void MainScreen_DoLogin(void) {
struct MainScreen* s = &MainScreen_Instance; struct MainScreen* s = &MainScreen_Instance;
String* user = &s->iptUsername.text; String* user = &s->iptUsername.text;
String* pass = &s->iptPassword.text; String* pass = &s->iptPassword.text;
@ -678,6 +677,7 @@ static void MainScreen_Login(void* w, int x, int y) {
LWidget_Redraw(&s->lblStatus); LWidget_Redraw(&s->lblStatus);
s->signingIn = true; s->signingIn = true;
} }
static void MainScreen_Login(void* w, int x, int y) { MainScreen_DoLogin(); }
static void MainScreen_Register(void* w, int x, int y) { static void MainScreen_Register(void* w, int x, int y) {
static const String ccUrl = String_FromConst("https://www.classicube.net/acc/register/"); static const String ccUrl = String_FromConst("https://www.classicube.net/acc/register/");
@ -740,11 +740,16 @@ static void MainScreen_Init(struct LScreen* s_) {
LInput_SetText(&s->iptUsername, &user); LInput_SetText(&s->iptUsername, &user);
LInput_SetText(&s->iptPassword, &pass); LInput_SetText(&s->iptPassword, &pass);
/* Auto sign in if automatically joining a server */
if (!Launcher_AutoHash.length) return;
if (!user.length || !pass.length) return;
MainScreen_DoLogin();
} }
static void MainScreen_Show(struct LScreen* s_) { static void MainScreen_Free(struct LScreen* s_) {
struct MainScreen* s = (struct MainScreen*)s_; struct MainScreen* s = (struct MainScreen*)s_;
/* status should reset after user has gone to another menu */ /* status should reset when user goes to another menu */
s->lblStatus.text.length = 0; s->lblStatus.text.length = 0;
} }
@ -893,7 +898,7 @@ void MainScreen_SetActive(void) {
struct MainScreen* s = &MainScreen_Instance; struct MainScreen* s = &MainScreen_Instance;
LScreen_Reset((struct LScreen*)s); LScreen_Reset((struct LScreen*)s);
s->Init = MainScreen_Init; s->Init = MainScreen_Init;
s->Show = MainScreen_Show; s->Free = MainScreen_Free;
s->Tick = MainScreen_Tick; s->Tick = MainScreen_Tick;
s->Layout = MainScreen_Layout; s->Layout = MainScreen_Layout;
s->HoverWidget = MainScreen_HoverWidget; s->HoverWidget = MainScreen_HoverWidget;