Added a new package for barony to get it updated to a version compatible with humble bundle release.
parent
3d4c472772
commit
a69e131928
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/src/engine/audio/sound.cpp b/src/engine/audio/sound.cpp
|
||||||
|
index 08940669..cd2d73ef 100644
|
||||||
|
--- a/src/engine/audio/sound.cpp
|
||||||
|
+++ b/src/engine/audio/sound.cpp
|
||||||
|
@@ -573,7 +573,10 @@ int initOPENAL()
|
||||||
|
|
||||||
|
printlog("[OpenAL]: initializing...\n");
|
||||||
|
printlog("[OpenAL]: opening device...\n");
|
||||||
|
- openal_device = alcOpenDevice(NULL); // preferred device
|
||||||
|
+ const char * defname = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
|
||||||
|
+
|
||||||
|
+ openal_device = alcOpenDevice(defname);
|
||||||
|
+
|
||||||
|
if(!openal_device)
|
||||||
|
return 0;
|
||||||
|
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 0d42d04a..241d7f6f 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -750,28 +750,41 @@ if (NOT APPLE AND UNIX)
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
- install(DIRECTORY
|
||||||
|
+
|
||||||
|
+ if (EXISTS books)
|
||||||
|
+
|
||||||
|
+ install(DIRECTORY
|
||||||
|
${CMAKE_SOURCE_DIR}/books
|
||||||
|
${CMAKE_SOURCE_DIR}/data
|
||||||
|
${CMAKE_SOURCE_DIR}/fonts
|
||||||
|
${CMAKE_SOURCE_DIR}/images
|
||||||
|
${CMAKE_SOURCE_DIR}/items
|
||||||
|
- ${CMAKE_SOURCE_DIR}/lang
|
||||||
|
${CMAKE_SOURCE_DIR}/maps
|
||||||
|
${CMAKE_SOURCE_DIR}/models
|
||||||
|
${CMAKE_SOURCE_DIR}/music
|
||||||
|
${CMAKE_SOURCE_DIR}/sound
|
||||||
|
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||||
|
- )
|
||||||
|
+ )
|
||||||
|
|
||||||
|
- install(FILES
|
||||||
|
+ install(FILES
|
||||||
|
${CMAKE_SOURCE_DIR}/steam_appid.txt
|
||||||
|
+ DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||||
|
+ )
|
||||||
|
+ endif()
|
||||||
|
+
|
||||||
|
+ install(DIRECTORY
|
||||||
|
+ ${CMAKE_SOURCE_DIR}/lang
|
||||||
|
+ DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
+ install(FILES
|
||||||
|
${CMAKE_SOURCE_DIR}/gamecontrollerdb.txt
|
||||||
|
${CMAKE_SOURCE_DIR}/playernames-female.txt
|
||||||
|
${CMAKE_SOURCE_DIR}/playernames-male.txt
|
||||||
|
#TYPE INCLUDE # If your CMAKE is stupid like mine and it complains about "install FILES given no DESTINATION!", you can tell it to shove it by uncommenting this line.
|
||||||
|
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||||
|
- )
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
endif()
|
||||||
|
# 2) Windows install targets
|
||||||
|
if (WIN32)
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
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
|
||||||
|
|
||||||
Loading…
Reference in new issue