Merge branch 'master' of https://github.com/fabiangreffrath/woof

.github/workflows/win_msvc.yml

@@ -5,8 +5,8 @@ on:
     branches: [ master ]
     tags: ['*']
     paths-ignore: ['**.md']
-  pull_request:
-    branches: [ master ]
+  # pull_request:
+  #   branches: [ master ]
 
 env:
   VCPKG_ROOT: C:\vcpkg

CMakeLists.txt

@@ -92,6 +92,7 @@ configure_file(config.h.in config.h)
 if(WIN32)
     install(FILES COPYING DESTINATION .)
     install(FILES README.md DESTINATION .)
+    install(FILES data/alsoft DESTINATION . RENAME alsoft.ini)
     install(DIRECTORY docs/ DESTINATION docs)
     install(DIRECTORY examples/ DESTINATION docs/examples)
     install(DIRECTORY autoload/ DESTINATION autoload)
@@ -101,6 +102,7 @@ if(WIN32)
 else()
     install(FILES COPYING DESTINATION "share/doc/${PROJECT_SHORTNAME}")
     install(FILES README.md DESTINATION "share/doc/${PROJECT_SHORTNAME}")
+    install(FILES data/alsoft DESTINATION "share/${PROJECT_SHORTNAME}" RENAME alsoft.conf)
     install(DIRECTORY autoload/ DESTINATION "share/${PROJECT_SHORTNAME}/autoload")
     if(EXISTS "${CMAKE_SOURCE_DIR}/docs")
         install(DIRECTORY docs/ DESTINATION "share/doc/${PROJECT_SHORTNAME}")

data/alsoft

@@ -0,0 +1,3 @@
+# OpenAL configuration. More options at
+# https://github.com/kcat/openal-soft/blob/master/alsoftrc.sample
+resampler = linear

src/i_sound.c

@@ -549,13 +549,17 @@ void I_InitSound(void)
     ALCdevice *device;
     ALCcontext *context;
 
-    if (nosfxparm)
+    if (nosfxparm && nomusicparm)
     {
         return;
     }
 
     printf("I_InitSound: ");
 
+#ifdef WOOFDATADIR
+    setenv("ALSOFT_CONF", WOOFDATADIR"/alsoft.conf", 0);
+#endif
+
     name = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
 
     device = alcOpenDevice(name);
@@ -585,6 +589,7 @@ void I_InitSound(void)
     snd_init = true;
 
     // [FG] precache all sound effects
+    if (!nosfxparm)
     {
       int i;