Merged all the different Lua states into one

No more Lua state for each status effect, monster, item effect or map. All
scripts are loaded into the same state. This should be more efficient overall
and make it easier to implement dynamic reloading of the scripts in the
future.

Now, this introduces the problem of name collisions between different Lua
scripts. For now this is solved by using more specific function names, like
'tick_plague' and 'tick_jump' rather than just 'tick'. The plan is however
to get rid of these globals, and register these callbacks from the script,
so that they can be local functions without the danger of colliding with
other scripts.

Reviewed-by: Erik Schilling
Reviewed-by: Yohann Ferreira

1 files changed, 0 insertions, 17 deletions

diff --git a/src/scripting/script.h b/src/scripting/script.h
index a7737512..bd143114 100644
--- a/src/scripting/script.h
+++ b/src/scripting/script.h
@@ -135,21 +135,6 @@ class Script
 
         virtual void processRemoveEvent(Thing *thing) = 0;
 
-        /**
-         * Loads the global event script file
-         */
-        static bool loadGlobalEventScript(const std::string &file);
-
-        /**
-         * Runs a function from the global event script file
-         */
-        static bool executeGlobalEventFunction(const std::string &function, Being *obj);
-        static void addDataToSpecial(int specialId, Special *special);
-        static bool performSpecialAction(int specialId, Being *caster);
-        static bool performCraft(Being *crafter, const std::list<InventoryItem> &recipe);
-
-        static std::string determineEngineByFilename(const std::string &filename);
-
     protected:
         std::string mScriptFile;
 
@@ -157,8 +142,6 @@ class Script
         MapComposite *mMap;
         EventListener mEventListener; /**< Tracking of being deaths. */
 
-        static Script *globalEventScript;
-
     friend struct ScriptEventDispatch;
 };