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

maybe fix switch/wii u builds

Browse source
This commit is contained in:
briaguya 2023-11-12 05:58:25 -05:00
commit b7600f77bd
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/soh/OTRGlobals.cpp
View file

@ -114,8 +114,9 @@ CrowdControl* CrowdControl::Instance;
#include "soh/resource/importer/BackgroundFactory.h" #include "soh/resource/importer/BackgroundFactory.h"
#include "soh/config/ConfigUpdaters.h" #include "soh/config/ConfigUpdaters.h"
#include "soh/Enhancements/accessible-actors/ActorAccessibility.h" #if !defined(__SWITCH__) && !defined(__WIIU__)
#include "Enhancements//accessible-actors/ActorAccessibility.h" #include "Enhancements/accessible-actors/ActorAccessibility.h"
#endif
OTRGlobals* OTRGlobals::Instance; OTRGlobals* OTRGlobals::Instance;
SaveManager* SaveManager::Instance; SaveManager* SaveManager::Instance;
CustomMessageManager* CustomMessageManager::Instance; CustomMessageManager* CustomMessageManager::Instance;
@ -467,10 +468,11 @@ void OTRAudio_Thread() {
for (int i = 0; i < AUDIO_FRAMES_PER_UPDATE; i++) { for (int i = 0; i < AUDIO_FRAMES_PER_UPDATE; i++) {
AudioMgr_CreateNextAudioBuffer(audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS), AudioMgr_CreateNextAudioBuffer(audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS),
num_audio_samples); num_audio_samples);
#if !defined(__SWITCH__) && !defined(__WIIU__)
// Give accessibility a chance to merge its own audio in. // Give accessibility a chance to merge its own audio in.
ActorAccessibility_MixAccessibleAudioWithGameAudio( ActorAccessibility_MixAccessibleAudioWithGameAudio(
audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS), num_audio_samples); 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)); 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; clearMtx = (uintptr_t)&gMtxClear;
OTRMessage_Init(); OTRMessage_Init();
#if !defined(__SWITCH__) && !defined(__WIIU__)
ActorAccessibility_Init(); ActorAccessibility_Init();
#endif
OTRAudio_Init(); OTRAudio_Init();
OTRExtScanner(); OTRExtScanner();
VanillaItemTable_Init(); VanillaItemTable_Init();
@ -1094,7 +1098,9 @@ extern "C" void DeinitOTR() {
CrowdControl::Instance->Disable(); CrowdControl::Instance->Disable();
CrowdControl::Instance->Shutdown(); CrowdControl::Instance->Shutdown();
#endif #endif
#if !defined(__SWITCH__) && !defined(__WIIU__)
ActorAccessibility_Shutdown(); 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. // Destroying gui here because we have shared ptrs to LUS objects which output to SPDLOG which is destroyed before these shared ptrs.
SohGui::Destroy(); SohGui::Destroy();