Use H_ music lumps from extras.wad if loaded

bradharding · Aug 9, 2024 · 56a2ec6 · 56a2ec6
1 parent 2a9c3af
commit 56a2ec6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/s_sound.c b/src/s_sound.c
@@ -615,7 +615,12 @@ void S_ChangeMusic(const musicnum_t musicnum, const bool looping,
     if (M_StringStartsWith(music->name1, "d_"))
         M_StringCopy(namebuf, music->name1, sizeof(namebuf));
     else
-        M_snprintf(namebuf, sizeof(namebuf), "d_%s", music->name1);
+    {
+        M_snprintf(namebuf, sizeof(namebuf), "h_%s", music->name1);
+
+        if (W_CheckNumForName(namebuf) == -1)
+            M_snprintf(namebuf, sizeof(namebuf), "d_%s", music->name1);
+    }
 
     // get lumpnum if necessary
     if (autosigil)