From b7600f77bd1f3486db6c8adb564da8c1f2cd2bbb Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Sun, 12 Nov 2023 05:58:25 -0500 Subject: [PATCH] maybe fix switch/wii u builds --- soh/soh/OTRGlobals.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 1b9ec11c3..a5b8b85ca 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -114,8 +114,9 @@ CrowdControl* CrowdControl::Instance; #include "soh/resource/importer/BackgroundFactory.h" #include "soh/config/ConfigUpdaters.h" -#include "soh/Enhancements/accessible-actors/ActorAccessibility.h" -#include "Enhancements//accessible-actors/ActorAccessibility.h" +#if !defined(__SWITCH__) && !defined(__WIIU__) +#include "Enhancements/accessible-actors/ActorAccessibility.h" +#endif OTRGlobals* OTRGlobals::Instance; SaveManager* SaveManager::Instance; CustomMessageManager* CustomMessageManager::Instance; @@ -467,10 +468,11 @@ void OTRAudio_Thread() { for (int i = 0; i < AUDIO_FRAMES_PER_UPDATE; i++) { AudioMgr_CreateNextAudioBuffer(audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS), num_audio_samples); +#if !defined(__SWITCH__) && !defined(__WIIU__) // Give accessibility a chance to merge its own audio in. ActorAccessibility_MixAccessibleAudioWithGameAudio( audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS), num_audio_samples); - +#endif } AudioPlayer_Play((u8*)audio_buffer, num_audio_samples * (sizeof(int16_t) * NUM_AUDIO_CHANNELS * AUDIO_FRAMES_PER_UPDATE)); @@ -1049,7 +1051,9 @@ extern "C" void InitOTR() { clearMtx = (uintptr_t)&gMtxClear; OTRMessage_Init(); + #if !defined(__SWITCH__) && !defined(__WIIU__) ActorAccessibility_Init(); + #endif OTRAudio_Init(); OTRExtScanner(); VanillaItemTable_Init(); @@ -1094,7 +1098,9 @@ extern "C" void DeinitOTR() { CrowdControl::Instance->Disable(); CrowdControl::Instance->Shutdown(); #endif +#if !defined(__SWITCH__) && !defined(__WIIU__) ActorAccessibility_Shutdown(); +#endif // Destroying gui here because we have shared ptrs to LUS objects which output to SPDLOG which is destroyed before these shared ptrs. SohGui::Destroy();