You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.8 KiB
55 lines
1.8 KiB
From 08db4d976439fa66b1ac059359aa9424243a25bc Mon Sep 17 00:00:00 2001
|
|
From: guilhermeivo <guilhermeivob@gmail.com>
|
|
Date: Wed, 20 Nov 2024 01:31:17 -0300
|
|
Subject: [PATCH] Fix incorrect uses of `ifdef` for `USE_FMOD` [#691]
|
|
|
|
---
|
|
src/ui/MainMenu.cpp | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ui/MainMenu.cpp b/src/ui/MainMenu.cpp
|
|
index 54e19cd6..d6ffed3d 100644
|
|
--- a/src/ui/MainMenu.cpp
|
|
+++ b/src/ui/MainMenu.cpp
|
|
@@ -2869,6 +2869,7 @@ namespace MainMenu {
|
|
} else {
|
|
fpsLimit = std::min(std::max(MIN_FPS, *cvar_desiredFps), MAX_FPS);
|
|
}
|
|
+ #if defined(USE_FMOD)
|
|
current_audio_device = audio_device;
|
|
if (fmod_speakermode != speaker_mode) {
|
|
fmod_speakermode = (FMOD_SPEAKERMODE)speaker_mode;
|
|
@@ -2876,6 +2877,7 @@ namespace MainMenu {
|
|
restartPromptRequired = true;
|
|
}
|
|
}
|
|
+ #endif
|
|
MainMenu::master_volume = std::min(std::max(0.f, master_volume / 100.f), 1.f);
|
|
sfxvolume = std::min(std::max(0.f, gameplay_volume / 100.f), 1.f);
|
|
sfxAmbientVolume = std::min(std::max(0.f, ambient_volume / 100.f), 1.f);
|
|
@@ -2974,7 +2976,9 @@ namespace MainMenu {
|
|
settings.fov = ::fov;
|
|
settings.fps = *cvar_desiredFps;
|
|
settings.audio_device = current_audio_device;
|
|
+ #if defined(USE_FMOD)
|
|
settings.speaker_mode = (int)fmod_speakermode;
|
|
+ #endif
|
|
settings.master_volume = MainMenu::master_volume * 100.f;
|
|
settings.gameplay_volume = (float)sfxvolume * 100.f;
|
|
settings.ambient_volume = (float)sfxAmbientVolume * 100.f;
|
|
@@ -6357,9 +6361,10 @@ bind_failed:
|
|
}
|
|
int y = 0;
|
|
|
|
+int num_drivers = 0;
|
|
#if !defined(NINTENDO) && defined(USE_FMOD)
|
|
int selected_device = 0;
|
|
- int num_drivers = 0;
|
|
+ num_drivers = 0;
|
|
(void)fmod_system->getNumDrivers(&num_drivers);
|
|
audio_drivers.clear();
|
|
audio_drivers.reserve(num_drivers);
|
|
--
|
|
2.46.0
|
|
|