Add LuaEntity on_death callback (#6177)

[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 5b047a08113fc9cadeb9430efef83935a209f699..28fefdd3796f587c4a0010e5bf42b006124a4b12 100644 (file)
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -22,14 +22,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <iostream>
 #include <string>
+#include <thread>
+#include "util/basic_macros.h"
 
 extern "C" {
 #include <lua.h>
 }
 
 #include "irrlichttypes.h"
-#include "threads.h"
-#include "threading/mutex.h"
 #include "threading/mutex_auto_lock.h"
 #include "common/c_types.h"
 #include "common/c_internal.h"
@@ -54,6 +54,12 @@ extern "C" {
 #define setOriginFromTable(index) \
        setOriginFromTableRaw(index, __FUNCTION__)
 
+enum class ScriptingType: u8 {
+       Client,
+       Server,
+       MainMenu
+};
+
 class Server;
 #ifndef SERVER
 class Client;
@@ -67,11 +73,16 @@ class ScriptApiBase {
 public:
        ScriptApiBase();
        virtual ~ScriptApiBase();
+       DISABLE_CLASS_COPY(ScriptApiBase);
 
        // These throw a ModError on failure
        void loadMod(const std::string &script_path, const std::string &mod_name);
        void loadScript(const std::string &script_path);
 
+#ifndef SERVER
+       void loadModFromMemory(const std::string &mod_name);
+#endif
+
        void runCallbacksRaw(int nargs,
                RunCallbacksMode mode, const char *fxn);
 
@@ -81,6 +92,8 @@ class ScriptApiBase {
 
        IGameDef *getGameDef() { return m_gamedef; }
        Server* getServer();
+       void setType(ScriptingType type) { m_type = type; }
+       ScriptingType getType() { return m_type; }
 #ifndef SERVER
        Client* getClient();
 #endif
@@ -116,22 +129,23 @@ class ScriptApiBase {
 
        void objectrefGetOrCreate(lua_State *L, ServerActiveObject *cobj);
 
-       RecursiveMutex  m_luastackmutex;
+       std::recursive_mutex m_luastackmutex;
        std::string     m_last_run_mod;
-       bool            m_secure;
+       bool            m_secure = false;
 #ifdef SCRIPTAPI_LOCK_DEBUG
        int             m_lock_recursion_count;
-       threadid_t      m_owning_thread;
+       std::thread::id m_owning_thread;
 #endif
 
 private:
        static int luaPanic(lua_State *L);
 
-       lua_State*      m_luastack;
+       lua_State      *m_luastack = nullptr;
 
-       IGameDef*       m_gamedef;
-       Environment*    m_environment;
-       GUIEngine*      m_guiengine;
+       IGameDef       *m_gamedef = nullptr;
+       Environment    *m_environment = nullptr;
+       GUIEngine      *m_guiengine = nullptr;
+       ScriptingType  m_type;
 };
 
 #endif /* S_BASE_H_ */