summaryrefslogtreecommitdiffstats
path: root/src/scripting/luautil.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-10-19 23:55:30 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-10-19 23:55:30 +0200
commit8629addec23239b667295c68ee3061ebc4ca918d (patch)
tree067f2969ea12053e5636dbb6035def59c32b01a2 /src/scripting/luautil.cpp
parent77ea3d90114a7d6503d19e89ffaf2e548f63e420 (diff)
parent03ff7c110e536de1f8b239817e50cb07c492da6f (diff)
Merge branch 'master' of github.com:mana/manaserv
Conflicts: src/game-server/accountconnection.cpp
Diffstat (limited to 'src/scripting/luautil.cpp')
-rw-r--r--src/scripting/luautil.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp
index b7680c6..a752142 100644
--- a/src/scripting/luautil.cpp
+++ b/src/scripting/luautil.cpp
@@ -116,3 +116,8 @@ void push(lua_State *s, double val)
{
lua_pushnumber(s, val);
}
+
+void push(lua_State *s, MapObject *val)
+{
+ lua_pushlightuserdata(s, val);
+}