From 72b6ac781b2b5996b58a50ab872009fd1b39bf8e Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 25 Oct 2020 02:45:03 -0700 Subject: [PATCH] on second thought, let UI-related settings reset no need to have quickfort_mode stay on forever --- plugins/buildingplan.cpp | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp index a89c6c8fd..528bd86cd 100644 --- a/plugins/buildingplan.cpp +++ b/plugins/buildingplan.cpp @@ -815,33 +815,6 @@ IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, render); IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, render); IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, render); -static DFHack::PersistentDataItem get_ui_settings_config() -{ - static const std::string settings_persistence_key = - "buildingplan/ui_settings"; - - bool added; - DFHack::PersistentDataItem config = - DFHack::World::GetPersistentData(settings_persistence_key, &added); - if (added) - { - config.ival(0) = quickfort_mode; - } - return config; -} - -static void load_settings() -{ - DFHack::PersistentDataItem config = get_ui_settings_config(); - quickfort_mode = config.ival(0); -} - -static void save_settings() -{ - DFHack::PersistentDataItem config = get_ui_settings_config(); - config.ival(0) = quickfort_mode; -} - static command_result buildingplan_cmd(color_ostream &out, vector & parameters) { if (!parameters.empty()) @@ -870,10 +843,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) if (enable != is_enabled) { if (DFHack::Core::getInstance().isMapLoaded()) - { - load_settings(); planner.reset(); - } if (!INTERPOSE_HOOK(buildingplan_query_hook, feed).apply(enable) || !INTERPOSE_HOOK(buildingplan_place_hook, feed).apply(enable) || @@ -903,7 +873,6 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan { switch (event) { case SC_MAP_LOADED: - load_settings(); planner.reset(); roomMonitor.reset(out); break; @@ -961,7 +930,6 @@ static void setSetting(std::string name, bool value) { { debug("setting quickfort_mode %d -> %d", quickfort_mode, value); quickfort_mode = value; - save_settings(); return; } planner.setGlobalSetting(name, value);