summaryrefslogtreecommitdiff
path: root/src/settings.h
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-03-13 04:35:34 +0100
committerShadowNinja <shadowninja@minetest.net>2015-03-18 13:03:02 -0400
commit538036d004f914f31c276090d7735d61139fc58e (patch)
tree6d8d067c49d2c96dfa9469798150a02e0bd594c4 /src/settings.h
parent467fc0ddc912ae38c3bf9fcb99e0b66d7478eec0 (diff)
downloadminetest-538036d004f914f31c276090d7735d61139fc58e.tar.gz
minetest-538036d004f914f31c276090d7735d61139fc58e.tar.bz2
minetest-538036d004f914f31c276090d7735d61139fc58e.zip
Fix game minetest.conf default settings
This was a regression introduced by f6e4c5d9cf459e8278a76a2beaee59732e841458 .
Diffstat (limited to 'src/settings.h')
-rw-r--r--src/settings.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings.h b/src/settings.h
index 1a7d9ab96..48708f6cc 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -202,6 +202,7 @@ public:
// remove a setting
bool remove(const std::string &name);
void clear();
+ void clearDefaults();
void updateValue(const Settings &other, const std::string &name);
void update(const Settings &other);
void registerChangedCallback(std::string name, setting_changed_callback cbf, void *userdata = NULL);
@@ -211,6 +212,7 @@ private:
void updateNoLock(const Settings &other);
void clearNoLock();
+ void clearDefaultsNoLock();
void doCallbacks(std::string name);