From 93a0d7ee838ff7bad9d2e89281bff76b15d9980f Mon Sep 17 00:00:00 2001 From: fallenoak Date: Sun, 19 Feb 2023 14:17:34 -0600 Subject: [PATCH] feat(glue): handle IsConnectedToServer script function --- src/ui/CMakeLists.txt | 2 ++ src/ui/ScriptFunctionsGlueScriptEvents.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 9c50757..353be13 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -11,11 +11,13 @@ target_include_directories(ui target_link_libraries(ui PRIVATE + client event glue gx math model + net util PUBLIC common diff --git a/src/ui/ScriptFunctionsGlueScriptEvents.cpp b/src/ui/ScriptFunctionsGlueScriptEvents.cpp index ea943ec..86765a8 100644 --- a/src/ui/ScriptFunctionsGlueScriptEvents.cpp +++ b/src/ui/ScriptFunctionsGlueScriptEvents.cpp @@ -1,7 +1,9 @@ #include "ui/ScriptFunctions.hpp" #include "client/Client.hpp" +#include "client/ClientServices.hpp" #include "glue/CGlueMgr.hpp" #include "gx/Coordinate.hpp" +#include "net/connection/ClientConnection.hpp" #include "ui/CSimpleTop.hpp" #include "ui/Types.hpp" #include "util/CVar.hpp" @@ -210,7 +212,13 @@ int32_t Script_DisconnectFromServer(lua_State* L) { } int32_t Script_IsConnectedToServer(lua_State* L) { - WHOA_UNIMPLEMENTED(); + if (ClientServices::Connection()->IsConnected()) { + lua_pushnumber(L, 1.0); + } else { + lua_pushnil(L); + } + + return 1; } int32_t Script_EnterWorld(lua_State* L) {