fix Demoloop missing support for DeHackEd Text substitution (#2269)

This commit is contained in:
elf-alchemist 2025-05-20 06:56:01 -03:00 committed by GitHub
parent 3c4b90f30a
commit 8553faabd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -25,9 +25,14 @@
#include "m_array.h" #include "m_array.h"
#include "m_json.h" #include "m_json.h"
#include "m_misc.h" #include "m_misc.h"
#include "sounds.h"
#include "d_demoloop.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 // Doom
static demoloop_entry_t demoloop_registered[] = { static demoloop_entry_t demoloop_registered[] = {
{ "TITLEPIC", "D_INTRO", 170, TYPE_ART, WIPE_MELT }, { "TITLEPIC", "D_INTRO", 170, TYPE_ART, WIPE_MELT },
@ -145,16 +150,23 @@ static void D_GetDefaultDemoLoop(GameMode_t mode)
{ {
case shareware: case shareware:
case registered: case registered:
DEH_MUSIC_LUMP(demoloop_registered[0].secondary_lump, mus_intro)
demoloop = demoloop_registered; demoloop = demoloop_registered;
demoloop_count = arrlen(demoloop_registered); demoloop_count = arrlen(demoloop_registered);
break; break;
case retail: case retail:
DEH_MUSIC_LUMP(demoloop_retail[0].secondary_lump, mus_intro)
demoloop = demoloop_retail; demoloop = demoloop_retail;
demoloop_count = arrlen(demoloop_retail); demoloop_count = arrlen(demoloop_retail);
break; break;
case commercial: 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 = demoloop_commercial;
demoloop_count = arrlen(demoloop_commercial); demoloop_count = arrlen(demoloop_commercial);
break; break;