script: Put getGuiEngine() inside a client-only #ifdef

diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 697e5f5563e5f7b06ef7575f788da6df2eb8ba9b..86f7f7bac9fdf1c0b198bc0b29897d55eaf7b161 100644 (file)
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -136,8 +136,10 @@ protected:
        Environment* getEnv() { return m_environment; }
        void setEnv(Environment* env) { m_environment = env; }
 
+#ifndef SERVER
        GUIEngine* getGuiEngine() { return m_guiengine; }
        void setGuiEngine(GUIEngine* guiengine) { m_guiengine = guiengine; }
+#endif
 
        void objectrefGetOrCreate(lua_State *L, ServerActiveObject *cobj);
 
@@ -158,6 +160,8 @@ private:
 
        IGameDef       *m_gamedef = nullptr;
        Environment    *m_environment = nullptr;
+#ifndef SERVER
        GUIEngine      *m_guiengine = nullptr;
+#endif
        ScriptingType  m_type;
 };

diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp
index c980bba3922e29fed40204ca7119a2c385560c78..b8658f62bfbdb7b262a21467093b830179b7cb0b 100644 (file)
--- a/src/script/lua_api/l_base.cpp
+++ b/src/script/lua_api/l_base.cpp
@@ -62,10 +62,12 @@ Environment *ModApiBase::getEnv(lua_State *L)
        return getScriptApiBase(L)->getEnv();
 }
 
+#ifndef SERVER
 GUIEngine *ModApiBase::getGuiEngine(lua_State *L)
 {
        return getScriptApiBase(L)->getGuiEngine();
 }
+#endif
 
 std::string ModApiBase::getCurrentModPath(lua_State *L)
 {

diff --git a/src/script/lua_api/l_base.h b/src/script/lua_api/l_base.h
index b46b5b567b04b5c3da28aeb88e3cd0084c78d6b6..e326476285cf028a796132ffb38190588b3b7c0e 100644 (file)
--- a/src/script/lua_api/l_base.h
+++ b/src/script/lua_api/l_base.h
@@ -32,12 +32,12 @@ extern "C" {
 
 #ifndef SERVER
 class Client;
+class GUIEngine;
 #endif
 
 class ScriptApiBase;
 class Server;
 class Environment;
-class GUIEngine;
 
 class ModApiBase : protected LuaHelper {
 
@@ -46,12 +46,13 @@ public:
        static Server*          getServer(lua_State *L);
        #ifndef SERVER
        static Client*          getClient(lua_State *L);
+       static GUIEngine*       getGuiEngine(lua_State *L);
        #endif // !SERVER
 
        static IGameDef*        getGameDef(lua_State *L);
 
        static Environment*     getEnv(lua_State *L);
-       static GUIEngine*       getGuiEngine(lua_State *L);
+
        // When we are not loading the mod, this function returns "."
        static std::string      getCurrentModPath(lua_State *L);