github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove gExtractSfx with instead checking if o2r exists

Browse source
This commit is contained in:
Demur Rumed 2025-06-08 02:15:50 +00:00
commit 7f24e8285b
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
View file

@ -130,7 +130,7 @@ void ActorAccessibility_Init() {
aa->isOn = CVarGetInteger(CVAR_SETTING("A11yAudioInteraction"), 0); aa->isOn = CVarGetInteger(CVAR_SETTING("A11yAudioInteraction"), 0);
if (!aa->isOn) if (!aa->isOn)
return; return;
aa->extractSfx = CVarGetInteger("gExtractSfx", 0); aa->extractSfx = !std::filesystem::exists(Ship::Context::GetPathRelativeToAppBundle("accessibility.o2r"));
if (aa->extractSfx) if (aa->extractSfx)
freezeGame = true; freezeGame = true;
ActorAccessibility_InitAudio(); ActorAccessibility_InitAudio();
@ -141,6 +141,7 @@ void ActorAccessibility_Init() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(ActorAccessibility_OnGameFrameUpdate); GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(ActorAccessibility_OnGameFrameUpdate);
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameStillFrozen>(ActorAccessibility_OnGameStillFrozen); GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameStillFrozen>(ActorAccessibility_OnGameStillFrozen);
} }
void ActorAccessibility_Shutdown() { void ActorAccessibility_Shutdown() {
ActorAccessibility_ShutdownAudio(); ActorAccessibility_ShutdownAudio();
delete aa; delete aa;

2
soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp
View file

@ -120,8 +120,6 @@ void SfxExtractor::ripNextSfx() {
} }
void SfxExtractor::finished() { void SfxExtractor::finished() {
OTRAudio_UninstallSfxCaptureThread(); // Returns to normal audio opperation. OTRAudio_UninstallSfxCaptureThread(); // Returns to normal audio opperation.
CVarClear("gExtractSfx");
CVarSave();
archive->Close(); archive->Close();
archive = nullptr; archive = nullptr;
freezeGame = false; freezeGame = false;

6
soh/soh/SohGui/SohMenuSettings.cpp
View file

@ -202,12 +202,6 @@ void SohMenu::AddMenuSettings() {
.RaceDisable(false) .RaceDisable(false)
.Options(CheckboxOptions().Tooltip("Enables accessibility audio cues")); .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, "EXPERIMENTAL", WIDGET_SEPARATOR_TEXT).Options(TextOptions().Color(Colors::Orange));
AddWidget(path, "ImGui Menu Scaling", WIDGET_CVAR_COMBOBOX) AddWidget(path, "ImGui Menu Scaling", WIDGET_CVAR_COMBOBOX)
.CVar(CVAR_SETTING("ImGuiScale")) .CVar(CVAR_SETTING("ImGuiScale"))