Revert "fix: Move setEffectAlpha and setMissileAlpha from framework t…

…o client" This reverts commit e58a883.
mehah · Dec 14, 2023 · ed3cd14 · ed3cd14
1 parent e58a883
commit ed3cd14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/client/luafunctions.cpp b/src/client/luafunctions.cpp
@@ -363,10 +363,6 @@ void Client::registerLuaFunctions()
     g_lua.registerSingletonClass("g_gameConfig");
     g_lua.bindSingletonFunction("g_gameConfig", "loadFonts", &GameConfig::loadFonts, &g_gameConfig);
 
-    g_lua.registerSingletonClass("g_client");
-    g_lua.bindSingletonFunction("g_client", "setEffectAlpha", &Client::setEffectAlpha, &g_client);
-    g_lua.bindSingletonFunction("g_client", "setMissileAlpha", &Client::setMissileAlpha, &g_client);
-
     g_lua.registerSingletonClass("g_attachedEffects");
     g_lua.bindSingletonFunction("g_attachedEffects", "getById", &AttachedEffectManager::getById, &g_attachedEffects);
     g_lua.bindSingletonFunction("g_attachedEffects", "registerByThing", &AttachedEffectManager::registerByThing, &g_attachedEffects);

diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp
@@ -31,7 +31,7 @@
 #include <framework/platform/platform.h>
 #include <framework/stdext/net.h>
 #include <framework/util/crypt.h>
-
+#include <client/client.h>
 
 #ifdef FRAMEWORK_GRAPHICS
 #include "framework/graphics/particleeffect.h"
@@ -324,6 +324,10 @@ void Application::registerLuaFunctions()
     g_lua.bindSingletonFunction("g_app", "setAnimatedTextScale", &GraphicalApplication::setAnimatedTextScale, &g_app);
     g_lua.bindSingletonFunction("g_app", "setStaticTextScale", &GraphicalApplication::setStaticTextScale, &g_app);
 
+    // Client
+    g_lua.registerSingletonClass("g_client");
+    g_lua.bindSingletonFunction("g_client", "setEffectAlpha", &Client::setEffectAlpha, &g_client);
+    g_lua.bindSingletonFunction("g_client", "setMissileAlpha", &Client::setMissileAlpha, &g_client);
 
     // PlatformWindow
     g_lua.registerSingletonClass("g_window");