From f0acbc1ca5cf0a32f26577b71a6ae84357d7a508 Mon Sep 17 00:00:00 2001 From: terminx Date: Sun, 20 Oct 2019 02:28:05 +0000 Subject: [PATCH] Fix AdLib timbre loading git-svn-id: https://svn.eduke32.com/eduke32@8231 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/sounds.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/duke3d/src/sounds.cpp b/source/duke3d/src/sounds.cpp index 0d4653753..48c8f2c24 100644 --- a/source/duke3d/src/sounds.cpp +++ b/source/duke3d/src/sounds.cpp @@ -119,9 +119,9 @@ void S_MusicStartup(void) { MUSIC_SetVolume(mus_volume); - // TODO: figure out why this produces garbage output -#if 0 - if (auto fil = kopen4load("d3dtimbr.tmb", 0) != -1) + auto const fil = kopen4load("d3dtimbr.tmb", 0); + + if (fil != buildvfs_kfd_invalid) { int l = kfilelength(fil); auto tmb = (uint8_t *)Xmalloc(l); @@ -130,7 +130,7 @@ void S_MusicStartup(void) Xfree(tmb); kclose(fil); } -#endif + return; }