Merge github.com:mana/manaserv

Conflicts:
	src/game-server/character.cpp
	src/scripting/lua.cpp

3 files changed, 20 insertions, 1 deletions

diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index 03d08771..1bb75137 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -477,7 +477,7 @@ static int chr_inv_count(lua_State *s)
 }
 
 /**
- * mana.chr_get_level(): int level
+ * mana.chr_get_level(Character*): int level
  * Tells the character current level.
  */
 static int chr_get_level(lua_State *s)
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp
index 490abf09..b6121bb8 100644
--- a/src/scripting/script.cpp
+++ b/src/scripting/script.cpp
@@ -20,6 +20,7 @@
 
 #include "scripting/script.h"
 
+#include "common/configuration.h"
 #include "common/resourcemanager.h"
 #include "game-server/being.h"
 #include "utils/logger.h"
@@ -172,3 +173,20 @@ bool Script::performCraft(Being* crafter, std::list<InventoryItem> recipe)
     }
     return true;
 }
+
+std::string Script::determineEngineByFilename(const std::string &filename)
+{
+    std::string ext = filename.substr(filename.find_last_of(".") + 1);
+
+    if (ext == "lua")
+    {
+        return "lua";
+    }
+    else
+    {
+        // Set to default engine and print warning
+        LOG_WARN("Unknown file extension for script \""
+                + filename + "\", falling back to default script engine");
+        return Configuration::getValue("defaultScriptEngine", "lua");
+    }
+}
diff --git a/src/scripting/script.h b/src/scripting/script.h
index 44a8b7ac..e2ab3afa 100644
--- a/src/scripting/script.h
+++ b/src/scripting/script.h
@@ -143,6 +143,7 @@ class Script
         static bool performSpecialAction(int specialId, Being *caster);
         static bool performCraft(Being* crafter, std::list<InventoryItem> recipe);
 
+        static std::string determineEngineByFilename(const std::string &filename);
 
     protected:
         static Script *globalEventScript;