summaryrefslogtreecommitdiff
path: root/src/settings.h
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-02-08 16:29:19 +0100
committerWeblate <42@minetest.ru>2013-02-08 16:29:19 +0100
commita27857e9382fb65140748dbbefb73a463827d4d6 (patch)
tree72bf4dfbd030f04d94573d793aa150574eb9839d /src/settings.h
parent0cda2d5193a80b32d3cae8a54d5866cbd3308592 (diff)
parent9b2044351fb3a18e47eec01e9b574aa86485c101 (diff)
downloadminetest-a27857e9382fb65140748dbbefb73a463827d4d6.tar.gz
minetest-a27857e9382fb65140748dbbefb73a463827d4d6.tar.bz2
minetest-a27857e9382fb65140748dbbefb73a463827d4d6.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src/settings.h')
-rw-r--r--src/settings.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/settings.h b/src/settings.h
index 2b46676c6..addd9980c 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -569,6 +569,12 @@ public:
return value;
}
+ u32 getFlagStr(std::string name, FlagDesc *flagdesc)
+ {
+ std::string val = get(name);
+ return (isdigit(val[0])) ? stoi(val) : readFlagString(val, flagdesc);
+ }
+
template <class T> T *getStruct(std::string name, std::string format)
{
size_t len = sizeof(T);
@@ -831,6 +837,11 @@ fail:
set(name, std::string(sbuf));
return true;
}
+
+ void setFlagStr(std::string name, u32 flags, FlagDesc *flagdesc)
+ {
+ set(name, writeFlagString(flags, flagdesc));
+ }
void setBool(std::string name, bool value)
{