thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix credit on ChangeMusic, use args

Browse source
This commit is contained in:
Sally Coolatta 2022-10-10 08:03:41 -04:00
parent 77ec64497c
commit aa7e26e40e
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.c
View file

@ -4944,6 +4944,8 @@ static void P_ConvertBinaryLinedefTypes(void)
lines[i].args[0] |= TMM_FORCERESET; lines[i].args[0] |= TMM_FORCERESET;
if (lines[i].flags & ML_MIDSOLID) if (lines[i].flags & ML_MIDSOLID)
lines[i].args[0] |= TMM_NOLOOP; 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[1] = sides[lines[i].sidenum[0]].midtexture;
lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;

6
src/p_spec.c
View file

@ -2451,9 +2451,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
else else
S_FadeMusicFromVolume(fadetarget, fadesource, postfadems); S_FadeMusicFromVolume(fadetarget, fadesource, postfadems);
//if (!(line->flags & ML_EFFECT3)) // FIXME: UDMFify
S_ShowMusicCredit();
if (position) if (position)
S_SetMusicPosition(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) ? prefadems : 0,
!(line->args[0] & TMM_FADE) ? postfadems : 0); !(line->args[0] & TMM_FADE) ? postfadems : 0);
if (!(line->args[0] & TMM_NOCREDIT))
S_ShowMusicCredit();
if ((line->args[0] & TMM_FADE) && fadetarget) if ((line->args[0] & TMM_FADE) && fadetarget)
{ {
if (!postfadems) if (!postfadems)

1
src/p_spec.h
View file

@ -343,6 +343,7 @@ typedef enum
TMM_NORELOAD = 1<<3, TMM_NORELOAD = 1<<3,
TMM_FORCERESET = 1<<4, TMM_FORCERESET = 1<<4,
TMM_NOLOOP = 1<<5, TMM_NOLOOP = 1<<5,
TMM_NOCREDIT = 1<<6,
} textmapmusicflags_t; } textmapmusicflags_t;
typedef enum typedef enum