From 8553faabd81f5489e1204a8d2d845ed2c6d2a8f0 Mon Sep 17 00:00:00 2001
From: elf-alchemist <alchemist.software@proton.me>
Date: Tue, 20 May 2025 06:56:01 -0300
Subject: [PATCH] fix Demoloop missing support for DeHackEd Text substitution
 (#2269)

---
 src/d_demoloop.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/d_demoloop.c b/src/d_demoloop.c
index 66a2cd24..932387ab 100644
--- a/src/d_demoloop.c
+++ b/src/d_demoloop.c
@@ -25,9 +25,14 @@
 #include "m_array.h"
 #include "m_json.h"
 #include "m_misc.h"
+#include "sounds.h"
 
 #include "d_demoloop.h"
 
+// Support for DeHackEd Text substitution, fixes PL2.WAD
+#define DEH_MUSIC_LUMP(buffer, mus_id) \
+            M_snprintf(buffer, sizeof buffer, "d_%s", S_music[mus_id].name);
+
 // Doom
 static demoloop_entry_t demoloop_registered[] = {
     { "TITLEPIC", "D_INTRO",  170, TYPE_ART,  WIPE_MELT },
@@ -145,16 +150,23 @@ static void D_GetDefaultDemoLoop(GameMode_t mode)
     {
         case shareware:
         case registered:
+            DEH_MUSIC_LUMP(demoloop_registered[0].secondary_lump, mus_intro)
+
             demoloop = demoloop_registered;
             demoloop_count = arrlen(demoloop_registered);
             break;
 
         case retail:
+            DEH_MUSIC_LUMP(demoloop_retail[0].secondary_lump, mus_intro)
+
             demoloop = demoloop_retail;
             demoloop_count = arrlen(demoloop_retail);
             break;
 
         case commercial:
+            DEH_MUSIC_LUMP(demoloop_commercial[0].secondary_lump, mus_dm2ttl)
+            DEH_MUSIC_LUMP(demoloop_commercial[4].secondary_lump, mus_dm2ttl)
+
             demoloop = demoloop_commercial;
             demoloop_count = arrlen(demoloop_commercial);
             break;