diff options
author | kwolekr <kwolekr@minetest.net> | 2014-10-08 15:28:14 -0400 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2014-10-26 23:55:45 -0400 |
commit | d274cbfce6ed39f5b7ad41261ede8c0fad7e980a (patch) | |
tree | b140fcc4ddb835e061bb5c0c94c5d0cab7742de0 /src/script/common/c_converter.h | |
parent | b49e5cfc7013cef7e9af79d17e04f7e7e4c377d4 (diff) | |
download | minetest-d274cbfce6ed39f5b7ad41261ede8c0fad7e980a.tar.gz minetest-d274cbfce6ed39f5b7ad41261ede8c0fad7e980a.tar.bz2 minetest-d274cbfce6ed39f5b7ad41261ede8c0fad7e980a.zip |
Add NodeResolver and clean up node name -> content ID resolution system
Diffstat (limited to 'src/script/common/c_converter.h')
-rw-r--r-- | src/script/common/c_converter.h | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h index 0c051a803..3b7eb6f7d 100644 --- a/src/script/common/c_converter.h +++ b/src/script/common/c_converter.h @@ -37,7 +37,7 @@ extern "C" { #include <lua.h> } -std::string getstringfield_default (lua_State *L, int table, +std::string getstringfield_default(lua_State *L, int table, const char *fieldname, const std::string &default_); bool getboolfield_default(lua_State *L, int table, const char *fieldname, bool default_); @@ -48,9 +48,12 @@ int getintfield_default (lua_State *L, int table, bool getstringfield(lua_State *L, int table, const char *fieldname, std::string &result); +bool getstringlistfield(lua_State *L, int table, + const char *fieldname, + std::vector<const char *> &result); bool getintfield(lua_State *L, int table, const char *fieldname, int &result); -void read_groups (lua_State *L, int index, +void read_groups(lua_State *L, int index, std::map<std::string, int> &result); bool getboolfield(lua_State *L, int table, const char *fieldname, bool &result); @@ -68,28 +71,29 @@ void setboolfield(lua_State *L, int table, const char *fieldname, bool value); -v3f checkFloatPos (lua_State *L, int index); -v3f check_v3f (lua_State *L, int index); -v3s16 check_v3s16 (lua_State *L, int index); +v3f checkFloatPos (lua_State *L, int index); +v3f check_v3f (lua_State *L, int index); +v3s16 check_v3s16 (lua_State *L, int index); -v3f read_v3f (lua_State *L, int index); -v2f read_v2f (lua_State *L, int index); -v2s16 read_v2s16 (lua_State *L, int index); -v2s32 read_v2s32 (lua_State *L, int index); -video::SColor readARGB8 (lua_State *L, int index); -aabb3f read_aabb3f (lua_State *L, int index, f32 scale); -v3s16 read_v3s16 (lua_State *L, int index); -std::vector<aabb3f> - read_aabb3f_vector (lua_State *L, int index, f32 scale); +v3f read_v3f (lua_State *L, int index); +v2f read_v2f (lua_State *L, int index); +v2s16 read_v2s16 (lua_State *L, int index); +v2s32 read_v2s32 (lua_State *L, int index); +video::SColor readARGB8 (lua_State *L, int index); +aabb3f read_aabb3f (lua_State *L, int index, f32 scale); +v3s16 read_v3s16 (lua_State *L, int index); +std::vector<aabb3f> read_aabb3f_vector (lua_State *L, int index, f32 scale); +bool read_stringlist (lua_State *L, int index, + std::vector<const char *> &result); -void push_v3s16 (lua_State *L, v3s16 p); -void pushFloatPos (lua_State *L, v3f p); -void push_v3f (lua_State *L, v3f p); -void push_v2f (lua_State *L, v2f p); +void push_v3s16 (lua_State *L, v3s16 p); +void pushFloatPos (lua_State *L, v3f p); +void push_v3f (lua_State *L, v3f p); +void push_v2f (lua_State *L, v2f p); -void warn_if_field_exists (lua_State *L, +void warn_if_field_exists (lua_State *L, int table, const char *fieldname, const std::string &message); |