summaryrefslogtreecommitdiff
path: root/src/script/common/c_content.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2014-02-08 17:50:26 -0500
committerkwolekr <kwolekr@minetest.net>2014-02-08 17:50:59 -0500
commit83bafbe08b508266d31a6a76f1ffc2cddc662390 (patch)
tree555f877e367a8e1a00200c3fe3fa889538169291 /src/script/common/c_content.cpp
parentf4f98c9550325aa8178f99cd32ea8806669aa280 (diff)
downloadminetest-83bafbe08b508266d31a6a76f1ffc2cddc662390.tar.gz
minetest-83bafbe08b508266d31a6a76f1ffc2cddc662390.tar.bz2
minetest-83bafbe08b508266d31a6a76f1ffc2cddc662390.zip
Make flag strings clear specified flag with 'no' prefix
Remove flagmask field from set_mapgen_params table Add small bits of needed documentation
Diffstat (limited to 'src/script/common/c_content.cpp')
-rw-r--r--src/script/common/c_content.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 0d1f7aa03..d1e182f9f 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -839,12 +839,11 @@ void push_hit_params(lua_State *L,const HitParams &params)
}
/******************************************************************************/
-u32 getflagsfield(lua_State *L, int table,
- const char *fieldname, FlagDesc *flagdesc) {
- std::string flagstring;
-
- flagstring = getstringfield_default(L, table, fieldname, "");
- return readFlagString(flagstring, flagdesc);
+u32 getflagsfield(lua_State *L, int table, const char *fieldname,
+ FlagDesc *flagdesc, u32 *flagmask)
+{
+ std::string flagstring = getstringfield_default(L, table, fieldname, "");
+ return readFlagString(flagstring, flagdesc, flagmask);
}
/******************************************************************************/