diff options
| author | Weblate <42@minetest.ru> | 2013-02-08 16:29:19 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-02-08 16:29:19 +0100 |
| commit | a27857e9382fb65140748dbbefb73a463827d4d6 (patch) | |
| tree | 72bf4dfbd030f04d94573d793aa150574eb9839d /src/util/string.h | |
| parent | 0cda2d5193a80b32d3cae8a54d5866cbd3308592 (diff) | |
| parent | 9b2044351fb3a18e47eec01e9b574aa86485c101 (diff) | |
| download | minetest-a27857e9382fb65140748dbbefb73a463827d4d6.tar.gz minetest-a27857e9382fb65140748dbbefb73a463827d4d6.tar.bz2 minetest-a27857e9382fb65140748dbbefb73a463827d4d6.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/util/string.h')
| -rw-r--r-- | src/util/string.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/util/string.h b/src/util/string.h index d081b365b..a469a074a 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -28,6 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <vector> #include <sstream> +struct FlagDesc { + const char *name; + u32 flag; +}; + static inline std::string padStringRight(std::string s, size_t len) { if(len > s.size()) @@ -283,6 +288,8 @@ inline std::string wrap_rows(const std::string &from, u32 rowlen) std::string translatePassword(std::string playername, std::wstring password); size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void *userdata); +u32 readFlagString(std::string str, FlagDesc *flagdesc); +std::string writeFlagString(u32 flags, FlagDesc *flagdesc); char *mystrtok_r(char *s, const char *sep, char **lasts); #endif |