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

Merge branch 'push-uswwntpxptps' into 'master'

Browse source 
Place song credits in credits on the bottom

See merge request kart-krew-dev/ring-racers-internal!2975
This commit is contained in:
Eidolon 2025-10-27 16:05:58 -05:00
commit 3d465337bb
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/hu_stuff.c
View file

@ -898,6 +898,7 @@ void HU_TickSongCredits(void)
cursongcredit.x = cursongcredit.old_x = 0; cursongcredit.x = cursongcredit.old_x = 0;
cursongcredit.anim = 0; cursongcredit.anim = 0;
cursongcredit.trans = NUMTRANSMAPS; cursongcredit.trans = NUMTRANSMAPS;
cursongcredit.use_credits_offset = false;
return; return;
} }
@ -1987,6 +1988,10 @@ void HU_DrawSongCredits(void)
{ {
y = (BASEVIDHEIGHT - 13) * FRACUNIT; y = (BASEVIDHEIGHT - 13) * FRACUNIT;
} }
else if (cursongcredit.use_credits_offset)
{
y = (BASEVIDHEIGHT - 13) * FRACUNIT;
}
else if (gamestate == GS_MENU) else if (gamestate == GS_MENU)
{ {
y = 30 * FRACUNIT; y = 30 * FRACUNIT;

1
src/s_sound.c
View file

@ -2452,6 +2452,7 @@ void S_ShowMusicCredit(void)
cursongcredit.anim = 5*TICRATE; cursongcredit.anim = 5*TICRATE;
cursongcredit.x = cursongcredit.old_x = 0; cursongcredit.x = cursongcredit.old_x = 0;
cursongcredit.trans = NUMTRANSMAPS; cursongcredit.trans = NUMTRANSMAPS;
cursongcredit.use_credits_offset = (gamestate == GS_CREDITS || (demo.playback && demo.attract == DEMO_ATTRACT_CREDITS));
} }
void S_StopMusicCredit(void) void S_StopMusicCredit(void)

1
src/s_sound.h
View file

@ -208,6 +208,7 @@ extern struct cursongcredit
UINT8 trans; UINT8 trans;
fixed_t x; fixed_t x;
fixed_t old_x; fixed_t old_x;
boolean use_credits_offset;
} cursongcredit; } cursongcredit;
// For menu, always appears // For menu, always appears