From 65c7b7799769c1a57eff01ec8eb14d1846a74df3 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Wed, 6 Jan 2021 06:30:54 -0500
Subject: [PATCH] - update $musicalias to allow iwad remapping when used from
 game_support.pk3 - add music aliases for the unity version of Doom/Doom2 for
 digitized game soundtrack - this fixes issue #1268

---
 src/sound/s_advsound.cpp                           |  2 +-
 .../static/filter/doom.id.doom1.unity/sndinfo.txt  |  9 +++++++++
 .../static/filter/doom.id.doom2.unity/sndinfo.txt  | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 wadsrc_extra/static/filter/doom.id.doom1.unity/sndinfo.txt
 create mode 100644 wadsrc_extra/static/filter/doom.id.doom2.unity/sndinfo.txt

diff --git a/src/sound/s_advsound.cpp b/src/sound/s_advsound.cpp
index 608826b355..cdc84b0a77 100644
--- a/src/sound/s_advsound.cpp
+++ b/src/sound/s_advsound.cpp
@@ -1176,7 +1176,7 @@ static void S_AddSNDINFO (int lump)
 					// do not set the alias if a later WAD defines its own music of this name
 					int file = fileSystem.GetFileContainer(lump);
 					int sndifile = fileSystem.GetFileContainer(sc.LumpNum);
-					if (file > sndifile)
+					if (!(sndifile == 1 && file <= fileSystem.GetIwadNum()) && (file > sndifile))
 					{
 						sc.MustGetString();
 						continue;
diff --git a/wadsrc_extra/static/filter/doom.id.doom1.unity/sndinfo.txt b/wadsrc_extra/static/filter/doom.id.doom1.unity/sndinfo.txt
new file mode 100644
index 0000000000..1f2fb5e7ad
--- /dev/null
+++ b/wadsrc_extra/static/filter/doom.id.doom1.unity/sndinfo.txt
@@ -0,0 +1,9 @@
+$musicalias d_inter d_e2m3
+$musicalias d_e2m5 d_e1m7
+$musicalias d_e3m5 d_e1m7
+$musicalias d_e3m1 d_e2m9
+$musicalias d_e3m4 d_e1m8
+$musicalias d_e3m5 d_e1m7
+$musicalias d_e3m6 d_e1m6
+$musicalias d_e3m7 d_e2m7
+$musicalias d_e3m9 d_e1m9
\ No newline at end of file
diff --git a/wadsrc_extra/static/filter/doom.id.doom2.unity/sndinfo.txt b/wadsrc_extra/static/filter/doom.id.doom2.unity/sndinfo.txt
new file mode 100644
index 0000000000..4f6596aaa7
--- /dev/null
+++ b/wadsrc_extra/static/filter/doom.id.doom2.unity/sndinfo.txt
@@ -0,0 +1,14 @@
+$musicalias d_count2 d_countd
+$musicalias d_ddtbl2 d_ddtblu
+$musicalias d_ddtbl3 d_ddtblu
+$musicalias d_dead2 d_dead
+$musicalias d_doom2 d_doom
+$musicalias d_messg2 d_messag
+$musicalias d_romer2 d_romero
+$musicalias d_runni2 d_runnin
+$musicalias d_shawn2 d_shawn
+$musicalias d_stlks2 d_stalks
+$musicalias d_theda2 d_the_da
+$musicalias d_shawn3 d_shawn
+$musicalias d_stlks3 d_stalks
+$musicalias d_theda3 d_the_da
\ No newline at end of file