summaryrefslogtreecommitdiff
path: root/src/scriptapi_types.h
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-04-03 20:32:13 +0200
committerWeblate <42@minetest.ru>2013-04-03 20:32:13 +0200
commit82709549ff61b4963e8b446fca4ead114650ce1a (patch)
tree691bea32cd002742a6f844b2fe4e74a08aa95296 /src/scriptapi_types.h
parent6e96bc98ded56ebefb5e597f3d8bee4d4d692dd8 (diff)
parent9ff8012655f13269f33d406f024374c67b650a9a (diff)
downloadminetest-82709549ff61b4963e8b446fca4ead114650ce1a.tar.gz
minetest-82709549ff61b4963e8b446fca4ead114650ce1a.tar.bz2
minetest-82709549ff61b4963e8b446fca4ead114650ce1a.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src/scriptapi_types.h')
-rw-r--r--src/scriptapi_types.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scriptapi_types.h b/src/scriptapi_types.h
index e3a611a9d..1eeed66df 100644
--- a/src/scriptapi_types.h
+++ b/src/scriptapi_types.h
@@ -51,6 +51,8 @@ bool getboolfield(lua_State *L, int table,
const char *fieldname, bool &result);
bool getfloatfield(lua_State *L, int table,
const char *fieldname, float &result);
+u32 getflagsfield(lua_State *L, int table,
+ const char *fieldname, FlagDesc *flagdesc);
std::string checkstringfield(lua_State *L, int table,
const char *fieldname);