From 83bafbe08b508266d31a6a76f1ffc2cddc662390 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 8 Feb 2014 17:50:26 -0500 Subject: Make flag strings clear specified flag with 'no' prefix Remove flagmask field from set_mapgen_params table Add small bits of needed documentation --- src/util/string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/util/string.h') 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); -- cgit v1.2.3