From aa7e26e40ef1ef49c862f158799ab88ad4bc86f4 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 10 Oct 2022 08:03:41 -0400 Subject: [PATCH] Fix credit on ChangeMusic, use args --- src/p_setup.c | 2 ++ src/p_spec.c | 6 +++--- src/p_spec.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index fecb5bf20..373222a2a 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4944,6 +4944,8 @@ static void P_ConvertBinaryLinedefTypes(void) lines[i].args[0] |= TMM_FORCERESET; if (lines[i].flags & ML_MIDSOLID) lines[i].args[0] |= TMM_NOLOOP; + if (lines[i].flags & ML_MIDPEG) + lines[i].args[0] |= TMM_NOCREDIT; lines[i].args[1] = sides[lines[i].sidenum[0]].midtexture; lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; diff --git a/src/p_spec.c b/src/p_spec.c index 0a80d15f6..132b113aa 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2451,9 +2451,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)) // FIXME: UDMFify - S_ShowMusicCredit(); - if (position) S_SetMusicPosition(position); } @@ -2479,6 +2476,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) !(line->args[0] & TMM_FADE) ? prefadems : 0, !(line->args[0] & TMM_FADE) ? postfadems : 0); + if (!(line->args[0] & TMM_NOCREDIT)) + S_ShowMusicCredit(); + if ((line->args[0] & TMM_FADE) && fadetarget) { if (!postfadems) diff --git a/src/p_spec.h b/src/p_spec.h index 096690d48..c07a65b71 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -343,6 +343,7 @@ typedef enum TMM_NORELOAD = 1<<3, TMM_FORCERESET = 1<<4, TMM_NOLOOP = 1<<5, + TMM_NOCREDIT = 1<<6, } textmapmusicflags_t; typedef enum