From 667e50bd6740c1d24f0c867118fa2972798f21b6 Mon Sep 17 00:00:00 2001 From: fallenoak Date: Mon, 22 Sep 2025 14:27:05 -0700 Subject: [PATCH] feat(gx): implement LoadingScreenDrawing --- src/glue/CGlueMgr.cpp | 6 +++--- src/glue/LoadingScreen.cpp | 6 ------ src/glue/LoadingScreen.hpp | 6 ------ src/gx/LoadingScreen.cpp | 8 ++++++++ src/gx/LoadingScreen.hpp | 6 ++++++ 5 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 src/glue/LoadingScreen.cpp delete mode 100644 src/glue/LoadingScreen.hpp create mode 100644 src/gx/LoadingScreen.cpp create mode 100644 src/gx/LoadingScreen.hpp diff --git a/src/glue/CGlueMgr.cpp b/src/glue/CGlueMgr.cpp index 88ad02c..8251357 100644 --- a/src/glue/CGlueMgr.cpp +++ b/src/glue/CGlueMgr.cpp @@ -1,10 +1,11 @@ #include "glue/CGlueMgr.hpp" #include "client/Client.hpp" #include "client/ClientServices.hpp" +#include "console/CVar.hpp" #include "glue/CRealmList.hpp" -#include "glue/LoadingScreen.hpp" #include "gx/Coordinate.hpp" #include "gx/Device.hpp" +#include "gx/LoadingScreen.hpp" #include "math/Utils.hpp" #include "net/Connection.hpp" #include "net/Login.hpp" @@ -15,11 +16,10 @@ #include "ui/FrameXML.hpp" #include "ui/Interface.hpp" #include "ui/ScriptFunctions.hpp" -#include "console/CVar.hpp" #include "util/Filesystem.hpp" #include "util/Log.hpp" -#include #include +#include unsigned char InterfaceKey[256] = { 0xC3, 0x5B, 0x50, 0x84, 0xB9, 0x3E, 0x32, 0x42, 0x8C, 0xD0, 0xC7, 0x48, 0xFA, 0x0E, 0x5D, 0x54, diff --git a/src/glue/LoadingScreen.cpp b/src/glue/LoadingScreen.cpp deleted file mode 100644 index 2149dbb..0000000 --- a/src/glue/LoadingScreen.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "glue/LoadingScreen.hpp" - -bool LoadingScreenDrawing() { - // TODO - return false; -} diff --git a/src/glue/LoadingScreen.hpp b/src/glue/LoadingScreen.hpp deleted file mode 100644 index 2c49b50..0000000 --- a/src/glue/LoadingScreen.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GLUE_LOADING_SCREEN_HPP -#define GLUE_LOADING_SCREEN_HPP - -bool LoadingScreenDrawing(); - -#endif diff --git a/src/gx/LoadingScreen.cpp b/src/gx/LoadingScreen.cpp new file mode 100644 index 0000000..14c9575 --- /dev/null +++ b/src/gx/LoadingScreen.cpp @@ -0,0 +1,8 @@ +#include "gx/LoadingScreen.hpp" +#include "gx/Screen.hpp" + +static HLAYER s_loadingScreenLayer; + +bool LoadingScreenDrawing() { + return s_loadingScreenLayer != nullptr; +} diff --git a/src/gx/LoadingScreen.hpp b/src/gx/LoadingScreen.hpp new file mode 100644 index 0000000..34fbe1c --- /dev/null +++ b/src/gx/LoadingScreen.hpp @@ -0,0 +1,6 @@ +#ifndef GX_LOADING_SCREEN_HPP +#define GX_LOADING_SCREEN_HPP + +bool LoadingScreenDrawing(); + +#endif