From 0d1c8fbcedd1dcabb6610f302bcc235756e66ff9 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sat, 7 Dec 2024 06:22:10 -0800 Subject: [PATCH] remove and tombstone faststart --- data/init/dfhack.tools.init | 1 - docs/about/Removed.rst | 7 ++++ docs/changelog.txt | 1 + docs/plugins/faststart.rst | 18 ---------- plugins/CMakeLists.txt | 1 - plugins/faststart.cpp | 69 ------------------------------------- 6 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 docs/plugins/faststart.rst delete mode 100644 plugins/faststart.cpp diff --git a/data/init/dfhack.tools.init b/data/init/dfhack.tools.init index 440fcac3c9..baa26d3ee4 100644 --- a/data/init/dfhack.tools.init +++ b/data/init/dfhack.tools.init @@ -7,7 +7,6 @@ # Enable system services enable buildingplan enable burrow -enable faststart enable logistics enable overlay enable preserve-rooms diff --git a/docs/about/Removed.rst b/docs/about/Removed.rst index 022b9a8e41..cfbb42ece2 100644 --- a/docs/about/Removed.rst +++ b/docs/about/Removed.rst @@ -153,6 +153,13 @@ embark-tools Replaced by `gui/embark-anywhere`. Other functionality was replaced by the DF v50 UI. +.. _faststart: + +faststart +========= +Sped up the initial DF load sequence. Removed since Bay 12 rewrote the startup +sequence and it is now sufficiently fast on its own. + .. _fix-armory: fix-armory diff --git a/docs/changelog.txt b/docs/changelog.txt index f4249c5572..3f5c5e9d49 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -93,6 +93,7 @@ Template for new versions: ## Removed - UI focus strings for squad panel flows combined into a single tree: ``dwarfmode/SquadEquipment`` -> ``dwarfmode/Squads/Equipment``, ``dwarfmode/SquadSchedule`` -> ``dwarfmode/Squads/Schedule`` +- `faststart`: removed since the vanilla startup sequence is now sufficiently fast # 50.14-r1 diff --git a/docs/plugins/faststart.rst b/docs/plugins/faststart.rst deleted file mode 100644 index b39269e01b..0000000000 --- a/docs/plugins/faststart.rst +++ /dev/null @@ -1,18 +0,0 @@ -faststart -========= - -.. dfhack-tool:: - :summary: Makes the main menu appear sooner. - :tags: dfhack interface - :no-command: - -This plugin accelerates the initial "Loading..." screen that appears when the -game first starts, so you don't have to wait as long before the Main Menu -appears and you can start playing. - -Usage ------ - -:: - - enable faststart diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index d26508289c..61c1829a42 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -115,7 +115,6 @@ if(BUILD_SUPPORTED) #add_subdirectory(embark-assistant) dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua) dfhack_plugin(fastdwarf fastdwarf.cpp) - dfhack_plugin(faststart faststart.cpp) dfhack_plugin(filltraffic filltraffic.cpp) dfhack_plugin(fix-occupancy fix-occupancy.cpp LINK_LIBRARIES lua) #dfhack_plugin(fixveins fixveins.cpp) diff --git a/plugins/faststart.cpp b/plugins/faststart.cpp deleted file mode 100644 index de014801c3..0000000000 --- a/plugins/faststart.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// Fast Startup tweak - -#include "Core.h" -#include -#include -#include -#include -#include - -#include "df/viewscreen_initial_prepst.h" -#include - -using namespace DFHack; -using namespace df::enums; -using std::vector; - -// Uncomment this to make the Loading screen as fast as possible -// This has the side effect of removing the dwarf face animation -// (and briefly making the game become unresponsive) - -//#define REALLY_FAST - -DFHACK_PLUGIN("faststart"); -DFHACK_PLUGIN_IS_ENABLED(is_enabled); - -struct prep_hook : df::viewscreen_initial_prepst -{ - typedef df::viewscreen_initial_prepst interpose_base; - - DEFINE_VMETHOD_INTERPOSE(void, logic, ()) - { -#ifdef REALLY_FAST - while (breakdown_level != interface_breakdown_types::STOPSCREEN) - { - render_count++; - INTERPOSE_NEXT(logic)(); - } -#else - render_count = 4; - INTERPOSE_NEXT(logic)(); -#endif - } -}; - -IMPLEMENT_VMETHOD_INTERPOSE(prep_hook, logic); - -DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) -{ - if (enable != is_enabled) - { - if (!INTERPOSE_HOOK(prep_hook, logic).apply(enable)) - return CR_FAILURE; - - is_enabled = enable; - } - - return CR_OK; -} - -DFhackCExport command_result plugin_init ( color_ostream &out, vector &commands) -{ - return CR_OK; -} - -DFhackCExport command_result plugin_shutdown ( color_ostream &out ) -{ - INTERPOSE_HOOK(prep_hook, logic).remove(); - return CR_OK; -}