[CSM] Add `on_punchnode` callback

[dragonfireclient.git] / src / script / cpp_api / s_base.h

diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 20f4bc11b0fe88344ca30c188696b13b69aab6d1..19d71df6517f27660f0ef2ec225ab3fd94709271 100644 (file)
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -28,6 +28,7 @@ extern "C" {
 }
 
 #include "irrlichttypes.h"
+#include "threads.h"
 #include "threading/mutex.h"
 #include "threading/mutex_auto_lock.h"
 #include "common/c_types.h"
@@ -54,6 +55,10 @@ extern "C" {
        setOriginFromTableRaw(index, __FUNCTION__)
 
 class Server;
+#ifndef SERVER
+class Client;
+#endif
+class IGameDef;
 class Environment;
 class GUIEngine;
 class ServerActiveObject;
@@ -74,7 +79,11 @@ class ScriptApiBase {
        void addObjectReference(ServerActiveObject *cobj);
        void removeObjectReference(ServerActiveObject *cobj);
 
-       Server* getServer() { return m_server; }
+       IGameDef *getGameDef() { return m_gamedef; }
+       Server* getServer();
+#ifndef SERVER
+       Client* getClient();
+#endif
 
        std::string getOrigin() { return m_last_run_mod; }
        void setOriginDirect(const char *origin);
@@ -82,6 +91,7 @@ class ScriptApiBase {
 
 protected:
        friend class LuaABM;
+       friend class LuaLBM;
        friend class InvRef;
        friend class ObjectRef;
        friend class NodeMetaRef;
@@ -96,7 +106,7 @@ class ScriptApiBase {
        void scriptError(int result, const char *fxn);
        void stackDump(std::ostream &o);
 
-       void setServer(Server* server) { m_server = server; }
+       void setGameDef(IGameDef* gamedef) { m_gamedef = gamedef; }
 
        Environment* getEnv() { return m_environment; }
        void setEnv(Environment* env) { m_environment = env; }
@@ -107,17 +117,20 @@ class ScriptApiBase {
        void objectrefGetOrCreate(lua_State *L, ServerActiveObject *cobj);
        void objectrefGet(lua_State *L, u16 id);
 
-       Mutex           m_luastackmutex;
+       RecursiveMutex  m_luastackmutex;
        std::string     m_last_run_mod;
        bool            m_secure;
 #ifdef SCRIPTAPI_LOCK_DEBUG
-       bool            m_locked;
+       int             m_lock_recursion_count;
+       threadid_t      m_owning_thread;
 #endif
 
 private:
+       static int luaPanic(lua_State *L);
+
        lua_State*      m_luastack;
 
-       Server*         m_server;
+       IGameDef*       m_gamedef;
        Environment*    m_environment;
        GUIEngine*      m_guiengine;
 };