mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-30 03:32:58 +00:00
Merge branch 'push-uswwntpxptps' into 'master'
Place song credits in credits on the bottom See merge request kart-krew-dev/ring-racers-internal!2975
This commit is contained in:
commit
3d465337bb
3 changed files with 7 additions and 0 deletions
|
|
@ -898,6 +898,7 @@ void HU_TickSongCredits(void)
|
|||
cursongcredit.x = cursongcredit.old_x = 0;
|
||||
cursongcredit.anim = 0;
|
||||
cursongcredit.trans = NUMTRANSMAPS;
|
||||
cursongcredit.use_credits_offset = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1987,6 +1988,10 @@ void HU_DrawSongCredits(void)
|
|||
{
|
||||
y = (BASEVIDHEIGHT - 13) * FRACUNIT;
|
||||
}
|
||||
else if (cursongcredit.use_credits_offset)
|
||||
{
|
||||
y = (BASEVIDHEIGHT - 13) * FRACUNIT;
|
||||
}
|
||||
else if (gamestate == GS_MENU)
|
||||
{
|
||||
y = 30 * FRACUNIT;
|
||||
|
|
|
|||
|
|
@ -2452,6 +2452,7 @@ void S_ShowMusicCredit(void)
|
|||
cursongcredit.anim = 5*TICRATE;
|
||||
cursongcredit.x = cursongcredit.old_x = 0;
|
||||
cursongcredit.trans = NUMTRANSMAPS;
|
||||
cursongcredit.use_credits_offset = (gamestate == GS_CREDITS || (demo.playback && demo.attract == DEMO_ATTRACT_CREDITS));
|
||||
}
|
||||
|
||||
void S_StopMusicCredit(void)
|
||||
|
|
|
|||
|
|
@ -208,6 +208,7 @@ extern struct cursongcredit
|
|||
UINT8 trans;
|
||||
fixed_t x;
|
||||
fixed_t old_x;
|
||||
boolean use_credits_offset;
|
||||
} cursongcredit;
|
||||
|
||||
// For menu, always appears
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue