Merged three global script states into one

These scripts could trivially share one script state, since the methods
called on them from the server are not overlapping. This does leave them
open to access each other's global variables, but that's the problem
with global variables.

The one remaining global script file name is now configurable, so that
it may also be set to a script in a different scripting language. The
two related script options are:

  script_mainFile (default: scripts/main.lua)
  script_defaultEngine (default: lua) - renamed from defaultScriptEngine

Reviewed-by: jurkan
Reviewed-by: Yohann Ferreira

1 files changed, 0 insertions, 33 deletions

diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index dc6230ca..af9da17b 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -187,36 +187,3 @@ void LuaScript::getPostCallback(Character *q, const std::string &sender,
     s->nbArgs = 3;
     s->execute();
 }
-
-bool LuaScript::loadGlobalEventScript(const std::string &file)
-{
-    Script::globalEventScript = new LuaScript();
-    if (!Script::globalEventScript->loadFile(file))
-    {
-        Script::globalEventScript = NULL;
-        return false;
-    }
-    return true;
-}
-
-bool LuaScript::loadSpecialActionsScript(const std::string &file)
-{
-    Script::specialActionsScript = new LuaScript();
-    if (!Script::specialActionsScript->loadFile(file))
-    {
-        Script::specialActionsScript = NULL;
-        return false;
-    }
-    return true;
-}
-
-bool LuaScript::loadCraftScript(const std::string &file)
-{
-    Script::craftScript = new LuaScript();
-    if (!Script::craftScript->loadFile(file))
-    {
-        Script::craftScript = NULL;
-        return false;
-    }
-    return true;
-}