Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

src/m_Do/m_Do_audio.cpp

@@ -14,6 +14,10 @@
 #include "m_Do/m_Do_dvd_thread.h"
 #include "tracy/Tracy.hpp"
 
+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 #if PLATFORM_WII || PLATFORM_SHIELD
 #include "Z2AudioCS/Z2AudioCS.h"
 #include <revolution/sc.h>
@@ -25,6 +29,18 @@ DUSK_GAME_DATA u8 mDoAud_zelAudio_c::mResetFlag;
 
 DUSK_GAME_DATA u8 mDoAud_zelAudio_c::mBgmSet;
 
+#if TARGET_PC
+void mDoAud_seStartMenu(u32 i_sfxID) {
+    if (!mDoAud_zelAudio_c::isInitFlag()) {
+        return;
+    }
+    if (!dusk::getSettings().audio.menuSounds.getValue()) {
+        return;
+    }
+    mDoAud_seStart(i_sfxID, nullptr, 0, 0);
+}
+#endif
+
 void mDoAud_zelAudio_c::reset() {
     mBgmSet = false;
 }

src/m_Do/m_Do_controller_pad.cpp

@@ -14,6 +14,7 @@
 
 #if TARGET_PC
 #include "dusk/menu_pointer.h"
+#include "dusk/settings.h"
 #include "dusk/ui/touch_controls.hpp"
 #endif
 
@@ -22,6 +23,22 @@ DUSK_GAME_DATA JUTGamePad* mDoCPd_c::m_gamePad[4];
 DUSK_GAME_DATA interface_of_controller_pad mDoCPd_c::m_cpadInfo[4];
 DUSK_GAME_DATA interface_of_controller_pad mDoCPd_c::m_debugCpadInfo[4];
 
+#if TARGET_PC
+s16 mDoCPd_c::getStickAngle3D(u32 pad) {
+    if (dusk::getSettings().game.enableMirrorMode) {
+        return -getCpadInfo(pad).mMainStickAngle;
+    }
+    return getCpadInfo(pad).mMainStickAngle;
+}
+
+f32 mDoCPd_c::getSubStickX3D(u32 pad) {
+    if (dusk::getSettings().game.enableMirrorMode) {
+        return -getCpadInfo(pad).mCStickPosX;
+    }
+    return getCpadInfo(pad).mCStickPosX;
+}
+#endif
+
 void mDoCPd_c::create() {
     #if PLATFORM_GCN || PLATFORM_SHIELD
     m_gamePad[0] = JKR_NEW JUTGamePad(JUTGamePad::EPort1);

src/m_Do/m_Do_graphic.cpp

@@ -51,10 +51,10 @@
 #include "aurora/lib/window.hpp"
 #include "d/actor/d_a_horse.h"
 #include "dusk/dusk.h"
-#include "dusk/endian.h"
+#include "helpers/endian.h"
 #include "dusk/frame_interpolation.h"
 #include "dusk/gfx.hpp"
-#include "dusk/gx_helper.h"
+#include "helpers/gx_helper.h"
 #include "dusk/imgui/ImGuiConsole.hpp"
 #include "dusk/logging.h"
 #include "dusk/settings.h"

src/m_Do/m_Do_main.cpp

@@ -65,6 +65,7 @@
 #include "dusk/mod_loader.hpp"
 #include "dusk/logging.h"
 #include "dusk/main.h"
+#include "dusk/os.h"
 #include "dusk/ui/menu_bar.hpp"
 #include "dusk/ui/overlay.hpp"
 #include "dusk/ui/prelaunch.hpp"
@@ -128,22 +129,6 @@ const int audioHeapSize = 0x14D800;
 // =========================================================================
 #define COPYDATE_PATH "/str/Final/Release/COPYDATE"
 
-#if TARGET_PC
-DUSK_GAME_DATA bool dusk::IsRunning = true;
-DUSK_GAME_DATA bool dusk::IsShuttingDown = false;
-DUSK_GAME_DATA bool dusk::IsGameLaunched = false;
-DUSK_GAME_DATA bool dusk::RestartRequested = false;
-DUSK_GAME_DATA uint8_t dusk::SaveRequested = 0;
-DUSK_GAME_DATA dusk::StageRequest dusk::StageRequested = {"",false};
-DUSK_GAME_DATA std::filesystem::path dusk::ConfigPath;
-DUSK_GAME_DATA std::filesystem::path dusk::CachePath;
-#endif
-
-void dusk::RequestRestart() noexcept {
-    RestartRequested = SupportsProcessRestart;
-    IsRunning = false;
-}
-
 s32 LOAD_COPYDATE(void*) {
     char buffer[32];
     memset(buffer, 0, sizeof(buffer));
@@ -171,9 +156,7 @@ s32 LOAD_COPYDATE(void*) {
     return 1;
 }
 
-DUSK_GAME_DATA AuroraInfo auroraInfo;
-DUSK_GAME_DATA AuroraStats dusk::lastFrameAuroraStats;
-DUSK_GAME_DATA float dusk::frameUsagePct = 0.0f;
+AuroraInfo auroraInfo;
 
 bool launchUILoop() {
     while (dusk::IsRunning && !dusk::IsGameLaunched) {
@@ -930,7 +913,10 @@ int game_main(int argc, char* argv[]) {
 
     main01();
 
-    dusk::MoviePlayerShutdown();
+    // We need to cleanly shut down the threads to avoid crashes on shutdown.
+    if (daMP_c::m_myObj) {
+        daMP_c::m_myObj->daMP_c_Finish();
+    }
 
     dusk::crash_reporting::shutdown();
     dusk::ShutdownFileLogging();

src/m_Do/m_Do_printf.cpp

@@ -9,6 +9,7 @@
 #include "m_Do/m_Do_ext.h"
 #if TARGET_PC
 #include <cstdarg>
+#include "dusk/os.h"
 #endif
 
 u8 __OSReport_disable;