Merge pull request #994 from maximegmd/feature/remove-old-patches

Remove old patches (fix #990)
maximegmd · Jan 19, 2025 · 2364187 · 2364187
2 parents 7a472f8 + 46478d8
commit 2364187
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 141 deletions.
diff --git a/src/Options.cpp b/src/Options.cpp
@@ -6,22 +6,19 @@
 
 void PatchesSettings::Load(const nlohmann::json& aConfig)
 {
-    SkipStartMenu = aConfig.value("skip_start_menu", SkipStartMenu);
     AsyncCompute = aConfig.value("disable_async_compute", AsyncCompute);
     Antialiasing = aConfig.value("disable_antialiasing", Antialiasing);
-    DisableIntroMovies = aConfig.value("disable_intro_movies", DisableIntroMovies);
     DisableVignette = aConfig.value("disable_vignette", DisableVignette);
     DisableBoundaryTeleport = aConfig.value("disable_boundary_teleport", DisableBoundaryTeleport);
     DisableWin7Vsync = aConfig.value("disable_win7_vsync", DisableWin7Vsync);
-    MinimapFlicker = aConfig.value("minimap_flicker", MinimapFlicker);
 }
 
 nlohmann::json PatchesSettings::Save() const
 {
     return {
-        {"disable_async_compute", AsyncCompute},      {"disable_antialiasing", Antialiasing}, {"skip_start_menu", SkipStartMenu},
-        {"disable_intro_movies", DisableIntroMovies}, {"disable_vignette", DisableVignette},  {"disable_boundary_teleport", DisableBoundaryTeleport},
-        {"disable_win7_vsync", DisableWin7Vsync},     {"minimap_flicker", MinimapFlicker},
+        {"disable_async_compute", AsyncCompute},  {"disable_antialiasing", Antialiasing},
+        {"disable_vignette", DisableVignette},    {"disable_boundary_teleport", DisableBoundaryTeleport},
+        {"disable_win7_vsync", DisableWin7Vsync},
     };
 }
 

diff --git a/src/Options.h b/src/Options.h
@@ -14,12 +14,9 @@ struct PatchesSettings
 
     bool AsyncCompute{false};
     bool Antialiasing{false};
-    bool SkipStartMenu{false};
-    bool DisableIntroMovies{false};
     bool DisableVignette{false};
     bool DisableBoundaryTeleport{false};
     bool DisableWin7Vsync{false};
-    bool MinimapFlicker{false};
 };
 
 struct FontSettings

diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -4,11 +4,7 @@
 
 #include "Options.h"
 
-#include "scripting/GameHooks.h"
-
-void StartScreenPatch();
 void OptionsInitHook();
-void DisableIntroMoviesPatch();
 void DisableVignettePatch();
 void DisableBoundaryTeleportPatch();
 
@@ -33,12 +29,6 @@ static void Initialize()
 
         // initialize patches
 
-        // if (options.Patches.SkipStartMenu)
-        //     StartScreenPatch();
-
-        if (options.Patches.DisableIntroMovies)
-            DisableIntroMoviesPatch();
-
         if (options.Patches.DisableVignette)
             DisableVignettePatch();
 

diff --git a/src/overlay/widgets/Settings.cpp b/src/overlay/widgets/Settings.cpp
@@ -64,14 +64,6 @@ void Settings::OnUpdate()
                     m_patches.AsyncCompute, patchesSettings.AsyncCompute);
                 UpdateAndDrawSetting(
                     "Disable Anti-aliasing", "Completely disables anti-aliasing (requires restart to take effect).", m_patches.Antialiasing, patchesSettings.Antialiasing);
-                UpdateAndDrawSetting(
-                    "Skip Start Menu",
-                    "Skips the 'Breaching...' menu asking you to press space bar to continue (requires restart to take "
-                    "effect).",
-                    m_patches.SkipStartMenu, patchesSettings.SkipStartMenu);
-                UpdateAndDrawSetting(
-                    "Suppress Intro Movies", "Disables logos played at the beginning (requires restart to take effect).", m_patches.DisableIntroMovies,
-                    patchesSettings.DisableIntroMovies);
                 UpdateAndDrawSetting(
                     "Disable Vignette", "Disables vignetting along screen borders (requires restart to take effect).", m_patches.DisableVignette, patchesSettings.DisableVignette);
                 UpdateAndDrawSetting(
@@ -80,10 +72,7 @@ void Settings::OnUpdate()
                 UpdateAndDrawSetting(
                     "Disable V-Sync (Windows 7 only)", "Disables VSync on Windows 7 to bypass the 60 FPS limit (requires restart to take effect).", m_patches.DisableWin7Vsync,
                     patchesSettings.DisableWin7Vsync);
-                UpdateAndDrawSetting(
-                    "Fix Minimap Flicker", "Fixes Minimap flicker caused by some mods (requires restart to take effect).", m_patches.MinimapFlicker,
-                    patchesSettings.MinimapFlicker);
-
+
                 ImGui::EndTable();
             }
             ImGui::TreePop();

diff --git a/src/patches/DisableIntroMovies.cpp b/src/patches/DisableIntroMovies.cpp
diff --git a/src/patches/MinimapFlicker.cpp b/src/patches/MinimapFlicker.cpp
diff --git a/src/patches/SkipStartScreen.cpp b/src/patches/SkipStartScreen.cpp