mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-11 17:51:04 +00:00
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
This commit is contained in:
parent
5e9dd1667b
commit
37a05ec8d6
21 changed files with 358 additions and 298 deletions
|
@ -351,6 +351,7 @@ Server::~Server()
|
|||
// Deinitialize scripting
|
||||
infostream << "Server: Deinitializing scripting" << std::endl;
|
||||
delete m_script;
|
||||
delete m_game_settings;
|
||||
|
||||
while (!m_unsent_map_edit_queue.empty()) {
|
||||
delete m_unsent_map_edit_queue.front();
|
||||
|
@ -368,6 +369,8 @@ void Server::init()
|
|||
infostream << "- world: " << m_path_world << std::endl;
|
||||
infostream << "- game: " << m_gamespec.path << std::endl;
|
||||
|
||||
m_game_settings = Settings::createLayer(SL_GAME);
|
||||
|
||||
// Create world if it doesn't exist
|
||||
try {
|
||||
loadGameConfAndInitWorld(m_path_world,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue