From 7f24e8285b198c46d2489aac9c067be54420c912 Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Sun, 8 Jun 2025 02:15:50 +0000
Subject: [PATCH] remove gExtractSfx with instead checking if o2r exists

---
 .../Enhancements/accessible-actors/ActorAccessibility.cpp   | 3 ++-
 soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp     | 2 --
 soh/soh/SohGui/SohMenuSettings.cpp                          | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
index 05a5320cb..da7a0a18b 100644
--- a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
+++ b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
@@ -130,7 +130,7 @@ void ActorAccessibility_Init() {
     aa->isOn = CVarGetInteger(CVAR_SETTING("A11yAudioInteraction"), 0);
     if (!aa->isOn)
         return;
-    aa->extractSfx = CVarGetInteger("gExtractSfx", 0);
+    aa->extractSfx = !std::filesystem::exists(Ship::Context::GetPathRelativeToAppBundle("accessibility.o2r"));
     if (aa->extractSfx)
         freezeGame = true;
     ActorAccessibility_InitAudio();
@@ -141,6 +141,7 @@ void ActorAccessibility_Init() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(ActorAccessibility_OnGameFrameUpdate);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameStillFrozen>(ActorAccessibility_OnGameStillFrozen);
 }
+
 void ActorAccessibility_Shutdown() {
     ActorAccessibility_ShutdownAudio();
     delete aa;
diff --git a/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp b/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp
index 901dc6829..f9fb6f7a1 100644
--- a/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp
+++ b/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp
@@ -120,8 +120,6 @@ void SfxExtractor::ripNextSfx() {
 }
 void SfxExtractor::finished() {
     OTRAudio_UninstallSfxCaptureThread(); // Returns to normal audio opperation.
-    CVarClear("gExtractSfx");
-    CVarSave();
     archive->Close();
     archive = nullptr;
     freezeGame = false;
diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp
index aa262dda7..6ee326410 100644
--- a/soh/soh/SohGui/SohMenuSettings.cpp
+++ b/soh/soh/SohGui/SohMenuSettings.cpp
@@ -202,12 +202,6 @@ void SohMenu::AddMenuSettings() {
         .RaceDisable(false)
         .Options(CheckboxOptions().Tooltip("Enables accessibility audio cues"));
 
-    AddWidget(path, "Extract Sfx", WIDGET_CVAR_CHECKBOX)
-        .CVar("gExtractSfx")
-        .RaceDisable(false)
-        .Options(CheckboxOptions().Tooltip("Extracts the sfx to be used in accessible audio cues, must be run once for "
-                                           "the audio cues to play then restart game"));
-
     AddWidget(path, "EXPERIMENTAL", WIDGET_SEPARATOR_TEXT).Options(TextOptions().Color(Colors::Orange));
     AddWidget(path, "ImGui Menu Scaling", WIDGET_CVAR_COMBOBOX)
         .CVar(CVAR_SETTING("ImGuiScale"))