diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-05-13 15:17:38 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-07-21 16:50:48 +0200 |
commit | 4f6f59bfb33bb5814b5489a405074c900b5299ab (patch) | |
tree | de71d200978f1e4c5c169cd70a6fec5106cbcd7e /src/scripting | |
parent | 329a1c0a0896c05ffb6954883248cb87f82daa56 (diff) | |
download | manaserv-4f6f59bfb33bb5814b5489a405074c900b5299ab.tar.gz manaserv-4f6f59bfb33bb5814b5489a405074c900b5299ab.tar.xz manaserv-4f6f59bfb33bb5814b5489a405074c900b5299ab.zip |
Fixed an error message and inlined some one-liners
Diffstat (limited to 'src/scripting')
-rw-r--r-- | src/scripting/luautil.cpp | 23 | ||||
-rw-r--r-- | src/scripting/luautil.h | 36 |
2 files changed, 29 insertions, 30 deletions
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp index e753e1b..3de23c7 100644 --- a/src/scripting/luautil.cpp +++ b/src/scripting/luautil.cpp @@ -247,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; } @@ -285,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); -} diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h index 3c8ada4..36ed80f 100644 --- a/src/scripting/luautil.h +++ b/src/scripting/luautil.h @@ -177,10 +177,26 @@ Script::Thread* checkCurrentThread(lua_State *s, Script *script = 0); /* Polymorphic wrapper for pushing variables. Useful for templates.*/ -void push(lua_State *s, int val); -void push(lua_State *s, const std::string &val); -void push(lua_State *s, Entity *val); -void push(lua_State *s, double val); + +inline void push(lua_State *s, int val) +{ + lua_pushinteger(s, val); +} + +inline void push(lua_State *s, const std::string &val) +{ + lua_pushstring(s, val.c_str()); +} + +inline void push(lua_State *s, Entity *val) +{ + lua_pushlightuserdata(s, val); +} + +inline void push(lua_State *s, double val) +{ + lua_pushnumber(s, val); +} inline void push(lua_State *s, MapObject *val) { @@ -189,7 +205,8 @@ inline void push(lua_State *s, MapObject *val) /* Pushes an STL LIST */ -template <typename T> void pushSTLContainer(lua_State *s, const std::list<T> &container) +template <typename T> +void pushSTLContainer(lua_State *s, const std::list<T> &container) { int len = container.size(); lua_createtable(s, len, 0); @@ -206,7 +223,8 @@ template <typename T> void pushSTLContainer(lua_State *s, const std::list<T> &co } /* Pushes an STL VECTOR */ -template <typename T> void pushSTLContainer(lua_State *s, const std::vector<T> &container) +template <typename T> +void pushSTLContainer(lua_State *s, const std::vector<T> &container) { int len = container.size(); lua_createtable(s, len, 0); @@ -220,7 +238,8 @@ template <typename T> void pushSTLContainer(lua_State *s, const std::vector<T> & } /* Pushes an STL MAP */ -template <typename Tkey, typename Tval> void pushSTLContainer(lua_State *s, const std::map<Tkey, Tval> &container) +template <typename Tkey, typename Tval> +void pushSTLContainer(lua_State *s, const std::map<Tkey, Tval> &container) { int len = container.size(); lua_createtable(s, 0, len); @@ -238,7 +257,8 @@ template <typename Tkey, typename Tval> void pushSTLContainer(lua_State *s, cons } /* Pushes an STL SET */ -template <typename T> void pushSTLContainer(lua_State *s, const std::set<T> &container) +template <typename T> +void pushSTLContainer(lua_State *s, const std::set<T> &container) { int len = container.size(); lua_createtable(s, len, 0); |