Skip to content

Commit

Permalink
Allow GZDoom to use custom Doom 1 E4 soundtracks
Browse files Browse the repository at this point in the history
Attempt to fix #2403 by assigning E4 music to Doom 1 E4 maps, and adding a SNDINFO lump with $musicalias commands, which will use the existing songs if a custom E4 soundtrack isn't available for Doom 1.
  • Loading branch information
Talon1024 authored and coelckers committed Feb 17, 2024
1 parent 6829a37 commit 6de9d83
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
9 changes: 9 additions & 0 deletions wadsrc/static/filter/doom.id.doom1/after_iwad/sndinfo.txt
@@ -0,0 +1,9 @@
$musicalias D_E4M1 D_E3M4
$musicalias D_E4M2 D_E3M2
$musicalias D_E4M3 D_E3M3
$musicalias D_E4M4 D_E1M5
$musicalias D_E4M5 D_E2M7
$musicalias D_E4M6 D_E2M4
$musicalias D_E4M7 D_E2M6
$musicalias D_E4M8 D_E2M5
$musicalias D_E4M9 D_E1M9
9 changes: 9 additions & 0 deletions wadsrc/static/language.def
Expand Up @@ -34,6 +34,15 @@ MUSIC_E3M6 = "e3m6";
MUSIC_E3M7 = "e3m7";
MUSIC_E3M8 = "e3m8";
MUSIC_E3M9 = "e3m9";
MUSIC_E4M1 = "e4m1";
MUSIC_E4M2 = "e4m2";
MUSIC_E4M3 = "e4m3";
MUSIC_E4M4 = "e4m4";
MUSIC_E4M5 = "e4m5";
MUSIC_E4M6 = "e4m6";
MUSIC_E4M7 = "e4m7";
MUSIC_E4M8 = "e4m8";
MUSIC_E4M9 = "e4m9";
MUSIC_INTER = "inter";
MUSIC_INTRO = "intro";
MUSIC_BUNNY = "bunny";
Expand Down
18 changes: 9 additions & 9 deletions wadsrc/static/mapinfo/doom1.txt
Expand Up @@ -408,7 +408,7 @@ map E4M1 lookup "HUSTR_E4M1"
sky1 = "SKY4"
cluster = 4
par = 165
music = "$MUSIC_E3M4"
music = "$MUSIC_E4M1"
}

map E4M2 lookup "HUSTR_E4M2"
Expand All @@ -420,7 +420,7 @@ map E4M2 lookup "HUSTR_E4M2"
sky1 = "SKY4"
cluster = 4
par = 255
music = "$MUSIC_E3M2"
music = "$MUSIC_E4M2"
}

map E4M3 lookup "HUSTR_E4M3"
Expand All @@ -432,7 +432,7 @@ map E4M3 lookup "HUSTR_E4M3"
sky1 = "SKY4"
cluster = 4
par = 135
music = "$MUSIC_E3M3"
music = "$MUSIC_E4M3"
}

map E4M4 lookup "HUSTR_E4M4"
Expand All @@ -444,7 +444,7 @@ map E4M4 lookup "HUSTR_E4M4"
sky1 = "SKY4"
cluster = 4
par = 150
music = "$MUSIC_E1M5"
music = "$MUSIC_E4M4"
}

map E4M5 lookup "HUSTR_E4M5"
Expand All @@ -456,7 +456,7 @@ map E4M5 lookup "HUSTR_E4M5"
sky1 = "SKY4"
cluster = 4
par = 180
music = "$MUSIC_E2M7"
music = "$MUSIC_E4M5"
}

map E4M6 lookup "HUSTR_E4M6"
Expand All @@ -470,7 +470,7 @@ map E4M6 lookup "HUSTR_E4M6"
par = 390
e4m6special
specialaction_opendoor
music = "$MUSIC_E2M4"
music = "$MUSIC_E4M6"
}

map E4M7 lookup "HUSTR_E4M7"
Expand All @@ -482,7 +482,7 @@ map E4M7 lookup "HUSTR_E4M7"
sky1 = "SKY4"
cluster = 4
par = 135
music = "$MUSIC_E2M6"
music = "$MUSIC_E4M7"
}

map E4M8 lookup "HUSTR_E4M8"
Expand All @@ -498,7 +498,7 @@ map E4M8 lookup "HUSTR_E4M8"
nosoundclipping
e4m8special
specialaction_lowerfloor
music = "$MUSIC_E2M5"
music = "$MUSIC_E4M8"
needclustertext
}

Expand All @@ -511,7 +511,7 @@ map E4M9 lookup "HUSTR_E4M9"
sky1 = "SKY4"
cluster = 4
par = 180
music = "$MUSIC_E1M9"
music = "$MUSIC_E4M9"
}

// Clusters (correspond with same-numbered episode)
Expand Down

0 comments on commit 6de9d83

Please sign in to comment.