diff options
| author | SmallJoker <mk939@ymail.com> | 2020-11-22 17:49:30 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-01-29 17:32:35 +0100 |
| commit | 37a05ec8d6cbf9ff4432225cffe78c16fdd0647d (patch) | |
| tree | 727e4272f1f16fe1a6a51484d1bba728c8632615 /src/gui | |
| parent | 5e9dd1667b244df4e7767be404d4a12966d6a90a (diff) | |
| download | minetest-37a05ec8d6cbf9ff4432225cffe78c16fdd0647d.tar.gz minetest-37a05ec8d6cbf9ff4432225cffe78c16fdd0647d.tar.bz2 minetest-37a05ec8d6cbf9ff4432225cffe78c16fdd0647d.zip | |
Settings: Proper priority hierarchy
Remove old defaults system
Introduce priority-based fallback list
Use new functions for map_meta special functions
Change groups to use end tags
Unittest changes:
* Adapt unittest to the new code
* Compare Settings objects
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/guiKeyChangeMenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp index eb641d952..4dcb47779 100644 --- a/src/gui/guiKeyChangeMenu.cpp +++ b/src/gui/guiKeyChangeMenu.cpp @@ -248,7 +248,7 @@ bool GUIKeyChangeMenu::acceptInput() { for (key_setting *k : key_settings) { std::string default_key; - g_settings->getDefaultNoEx(k->setting_name, default_key); + Settings::getLayer(SL_DEFAULTS)->getNoEx(k->setting_name, default_key); if (k->key.sym() != default_key) g_settings->set(k->setting_name, k->key.sym()); |