Merge remote-tracking branch 'origin/master' into lpc2012

1 files changed, 1 insertions, 34 deletions

diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp
index fd83b58b..3de23c77 100644
--- a/src/scripting/luautil.cpp
+++ b/src/scripting/luautil.cpp
@@ -33,18 +33,6 @@
 #include "scripting/luascript.h"
 
 
-void raiseScriptError(lua_State *s, const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    char message[1024];
-    vsprintf(message, format, args);
-    va_end(args);
-
-    LOG_WARN("Lua script error: "<< message);
-    luaL_error(s, message);
-}
-
 void raiseWarning(lua_State *, const char *format, ...)
 {
     va_list args;
@@ -259,7 +247,7 @@ int checkSkill(lua_State *s, int p)
         return luaL_checkint(s, p);
 
     int id = skillManager->getId(luaL_checkstring(s, p));
-    luaL_argcheck(s, id != 0, p, "invalid special name");
+    luaL_argcheck(s, id != 0, p, "invalid skill name");
     return id;
 }
 
@@ -297,24 +285,3 @@ Script::Thread *checkCurrentThread(lua_State *s, Script *script /* = 0 */)
 
     return thread;
 }
-
-
-void push(lua_State *s, int val)
-{
-    lua_pushinteger(s, val);
-}
-
-void push(lua_State *s, const std::string &val)
-{
-    lua_pushstring(s, val.c_str());
-}
-
-void push(lua_State *s, Entity *val)
-{
-    lua_pushlightuserdata(s, val);
-}
-
-void push(lua_State *s, double val)
-{
-    lua_pushnumber(s, val);
-}