From b7f01b0cc7c466f09e2d9c01b62f6ea15d8ba259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Fri, 14 Feb 2025 22:25:39 +0100 Subject: [PATCH] Don't save `load_mod_* = false` lines in `world.mt` (#15758) --- builtin/mainmenu/dlg_config_world.lua | 2 +- src/content/mod_configuration.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua index cb5cdd635..416a4a6f3 100644 --- a/builtin/mainmenu/dlg_config_world.lua +++ b/builtin/mainmenu/dlg_config_world.lua @@ -299,7 +299,7 @@ local function handle_buttons(this, fields) worldfile:set("load_mod_" .. mod.name, mod.virtual_path) was_set[mod.name] = true elseif not was_set[mod.name] then - worldfile:set("load_mod_" .. mod.name, "false") + worldfile:remove("load_mod_" .. mod.name) end elseif mod.enabled then gamedata.errormessage = fgettext_ne("Failed to enable mo" .. diff --git a/src/content/mod_configuration.cpp b/src/content/mod_configuration.cpp index 810ea7626..71e708b6e 100644 --- a/src/content/mod_configuration.cpp +++ b/src/content/mod_configuration.cpp @@ -140,8 +140,6 @@ void ModConfiguration::addModsFromConfig( * * Alternative candidates for a modname are stored in `candidates`, * and used in an error message later. - * - * If not enabled, add `load_mod_modname = false` to world.mt */ for (const auto &modPath : modPaths) { std::vector addon_mods_in_path = flattenMods(getModsInPath(modPath.second, modPath.first)); @@ -154,7 +152,7 @@ void ModConfiguration::addModsFromConfig( candidates[pair->first].emplace_back(mod.virtual_path); } } else { - conf.setBool("load_mod_" + mod.name, false); + conf.remove("load_mod_" + mod.name); } } }