From d5bd7681a0f729aa9c13979911766bb02fbf0f22 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 25 Feb 2017 08:16:04 +0000
Subject: [PATCH] Remove XYZ.voc --> XYZ.flac format upgrades completely for
 sound effects, and leave them only for music.

XYZ.voc --> XYZ_voc.flac is still available.

git-svn-id: https://svn.eduke32.com/eduke32@6079 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp
index 05d659991..13f09380c 100644
--- a/source/duke3d/src/common.cpp
+++ b/source/duke3d/src/common.cpp
@@ -1086,7 +1086,7 @@ static int32_t S_TryExtensionReplacements(char * const testfn, char const search
     }
 
     // ex: grabbag.mid --> grabbag.*
-    if (ismusic) // this conditional is a hack so that subway.voc does not upgrade to Megaton's music/subway.ogg
+    if (ismusic)
     {
         int32_t const fp = S_TryFormats(testfn, extension, searchfirst);
         if (fp >= 0)
@@ -1108,7 +1108,7 @@ int32_t S_OpenAudio(const char *fn, char searchfirst, uint8_t const ismusic)
     // ex: ./grabbag.mid
     {
         Bstrcpy(testfn, fn);
-        int32_t const fp = S_TryExtensionReplacements(testfn, searchfirst, 1);
+        int32_t const fp = S_TryExtensionReplacements(testfn, searchfirst, ismusic);
         if (fp >= 0)
         {
             Bfree(testfn);