From dfcc959adb3d8915de66e6f8e03a9392076c5b2c Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 5 Aug 2023 13:12:13 +0300 Subject: [PATCH 1/3] Always show music credit with linedef action 413, regardless of fade --- src/p_spec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/p_spec.c b/src/p_spec.c index 762214d45..ba691feeb 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2463,9 +2463,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) else S_FadeMusicFromVolume(fadetarget, fadesource, postfadems); - if (!(line->flags & ML_EFFECT3)) - S_ShowMusicCredit(); - if (position) S_SetMusicPosition(position); } @@ -2497,6 +2494,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } } + // Show credit + if (!(line->flags & ML_EFFECT3)) + S_ShowMusicCredit(); + // Except, you can use the ML_BLOCKMONSTERS flag to change this behavior. // if (mapmusflags & MUSIC_RELOADRESET) then it will reset the music in G_PlayerReborn. } From efb03e70adb0b6b85040143b9dd429958b2fcc1a Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 6 Aug 2023 13:50:05 +0300 Subject: [PATCH 2/3] Fix linedef 413 showing wrong music credit sometimes --- src/p_spec.c | 4 ++-- src/s_sound.c | 18 ++++++++++++++---- src/s_sound.h | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/p_spec.c b/src/p_spec.c index ba691feeb..11d74dc1e 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2495,8 +2495,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } // Show credit - if (!(line->flags & ML_EFFECT3)) - S_ShowMusicCredit(); + if (!(line->flags & ML_EFFECT3) && !musicsame && sides[line->sidenum[0]].text[0]) + S_ShowSpecifiedMusicCredit(sides[line->sidenum[0]].text); // Except, you can use the ML_BLOCKMONSTERS flag to change this behavior. // if (mapmusflags & MUSIC_RELOADRESET) then it will reset the music in G_PlayerReborn. diff --git a/src/s_sound.c b/src/s_sound.c index 75785dac2..c0d78bad2 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1485,11 +1485,11 @@ void S_InitMusicDefs(void) } // -// S_ShowMusicCredit +// S_ShowSpecifiedMusicCredit // -// Display current song's credit on screen +// Display song's credit on screen // -void S_ShowMusicCredit(void) +void S_ShowSpecifiedMusicCredit(const char *musname) { musicdef_t *def = musicdefstart; @@ -1501,7 +1501,7 @@ void S_ShowMusicCredit(void) while (def) { - if (!stricmp(def->name, music_name)) + if (!stricmp(def->name, musname)) { cursongcredit.def = def; cursongcredit.anim = 5*TICRATE; @@ -1514,6 +1514,16 @@ void S_ShowMusicCredit(void) } } +// +// S_ShowMusicCredit +// +// Display current song's credit on screen +// +void S_ShowMusicCredit(void) +{ + S_ShowSpecifiedMusicCredit(music_name); +} + /// ------------------------ /// Music Status /// ------------------------ diff --git a/src/s_sound.h b/src/s_sound.h index d67bb7bcf..577ccfb54 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -154,6 +154,7 @@ extern musicdef_t *musicdefstart; void S_LoadMusicDefs(UINT16 wadnum); void S_InitMusicDefs(void); +void S_ShowSpecifiedMusicCredit(const char *musname); void S_ShowMusicCredit(void); // From 17d64e1f29ee11f3d9b0ae5085c3cf56438b1d81 Mon Sep 17 00:00:00 2001 From: Indev Date: Wed, 9 Aug 2023 14:20:01 +0300 Subject: [PATCH 3/3] Add small hack so encore music doesn't get shown twice --- src/p_spec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_spec.c b/src/p_spec.c index 11d74dc1e..7779ac6cd 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2495,7 +2495,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } // Show credit - if (!(line->flags & ML_EFFECT3) && !musicsame && sides[line->sidenum[0]].text[0]) + if (!(line->flags & ML_EFFECT3) && !musicsame && sides[line->sidenum[0]].text[0] && leveltime >= starttime) S_ShowSpecifiedMusicCredit(sides[line->sidenum[0]].text); // Except, you can use the ML_BLOCKMONSTERS flag to change this behavior.