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/server.h | |
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/server.h')
-rw-r--r-- | src/server.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server.h b/src/server.h index a7e85d0e1..1dd181794 100644 --- a/src/server.h +++ b/src/server.h @@ -524,6 +524,7 @@ private: u16 m_max_chatmessage_length; // For "dedicated" server list flag bool m_dedicated; + Settings *m_game_settings = nullptr; // Thread can set; step() will throw as ServerError MutexedVariable<std::string> m_async_fatal_error; |