aboutsummaryrefslogtreecommitdiff
path: root/src/util/string.h
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/util/string.h
parentf4f98c9550325aa8178f99cd32ea8806669aa280 (diff)
downloaddragonfireclient-83bafbe08b508266d31a6a76f1ffc2cddc662390.tar.xz
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/util/string.h')
-rw-r--r--src/util/string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/string.h b/src/util/string.h
index e5a60bc47..d6a9926ab 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -319,8 +319,8 @@ inline std::string unescape_string(std::string &s)
std::string translatePassword(std::string playername, std::wstring password);
std::string urlencode(std::string str);
std::string urldecode(std::string str);
-u32 readFlagString(std::string str, FlagDesc *flagdesc);
-std::string writeFlagString(u32 flags, FlagDesc *flagdesc);
+u32 readFlagString(std::string str, FlagDesc *flagdesc, u32 *flagmask);
+std::string writeFlagString(u32 flags, FlagDesc *flagdesc, u32 flagmask);
char *mystrtok_r(char *s, const char *sep, char **lasts);
u64 read_seed(const char *str);