stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 04:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Interpolate song credits

Browse source
This commit is contained in:
Sally Coolatta 2022-05-02 00:02:06 -04:00
parent d45390f617
commit 84a59cd76c
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/hu_stuff.c
View file

@ -1091,6 +1091,8 @@ void HU_Ticker(void)
} }
if (cechotimer > 0) --cechotimer; if (cechotimer > 0) --cechotimer;
HU_TickSongCredits();
} }
#ifndef NONET #ifndef NONET
@ -2270,10 +2272,27 @@ static void HU_DrawDemoInfo(void)
// //
// Song credits // Song credits
// //
void HU_TickSongCredits(void)
{
if (cursongcredit.anim)
{
if (cursongcredit.trans > 0)
cursongcredit.trans--;
cursongcredit.anim--;
}
else
{
if (cursongcredit.trans < NUMTRANSMAPS)
cursongcredit.trans++;
}
}
void HU_DrawSongCredits(void) void HU_DrawSongCredits(void)
{ {
char *str; char *str;
INT32 len, destx; INT32 len;
fixed_t destx;
INT32 y = (splitscreen ? (BASEVIDHEIGHT/2)-4 : 32); INT32 y = (splitscreen ? (BASEVIDHEIGHT/2)-4 : 32);
INT32 bgt; INT32 bgt;
@ -2282,33 +2301,31 @@ void HU_DrawSongCredits(void)
str = va("\x1F"" %s", cursongcredit.def->source); str = va("\x1F"" %s", cursongcredit.def->source);
len = V_ThinStringWidth(str, V_ALLOWLOWERCASE|V_6WIDTHSPACE); len = V_ThinStringWidth(str, V_ALLOWLOWERCASE|V_6WIDTHSPACE);
destx = (len+7); destx = (len + 7) * FRACUNIT;
if (cursongcredit.anim) if (cursongcredit.anim)
{ {
if (cursongcredit.trans > 0)
cursongcredit.trans--;
if (cursongcredit.x < destx) if (cursongcredit.x < destx)
cursongcredit.x += (destx - cursongcredit.x) / 2; cursongcredit.x += FixedMul((destx - cursongcredit.x) / 2, renderdeltatics);
if (cursongcredit.x > destx) if (cursongcredit.x > destx)
cursongcredit.x = destx; cursongcredit.x = destx;
cursongcredit.anim--;
} }
else else
{ {
if (cursongcredit.trans < NUMTRANSMAPS)
cursongcredit.trans++;
if (cursongcredit.x > 0) if (cursongcredit.x > 0)
cursongcredit.x /= 2; cursongcredit.x -= FixedMul(cursongcredit.x / 2, renderdeltatics);
if (cursongcredit.x < 0) if (cursongcredit.x < 0)
cursongcredit.x = 0; cursongcredit.x = 0;
} }
bgt = (NUMTRANSMAPS/2)+(cursongcredit.trans/2); bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2);
// v1 does not have v2's font revamp, so there is no function for thin string at fixed_t
// sooo I'm just killing the precision.
if (bgt < NUMTRANSMAPS) if (bgt < NUMTRANSMAPS)
V_DrawScaledPatch(cursongcredit.x, y-2, V_SNAPTOLEFT|(bgt<<V_ALPHASHIFT), songcreditbg); V_DrawScaledPatch(cursongcredit.x / FRACUNIT, y-2, V_SNAPTOLEFT|(bgt<<V_ALPHASHIFT), songcreditbg);
if (cursongcredit.trans < NUMTRANSMAPS) if (cursongcredit.trans < NUMTRANSMAPS)
V_DrawRightAlignedThinString(cursongcredit.x, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_SNAPTOLEFT|(cursongcredit.trans<<V_ALPHASHIFT), str); V_DrawRightAlignedThinString(cursongcredit.x / FRACUNIT, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_SNAPTOLEFT|(cursongcredit.trans<<V_ALPHASHIFT), str);
} }

1
src/hu_stuff.h
View file

@ -109,6 +109,7 @@ void HU_Start(void);
boolean HU_Responder(event_t *ev); boolean HU_Responder(event_t *ev);
void HU_Ticker(void); void HU_Ticker(void);
void HU_TickSongCredits(void);
void HU_DrawSongCredits(void); void HU_DrawSongCredits(void);
void HU_Drawer(void); void HU_Drawer(void);
char HU_dequeueChatChar(void); char HU_dequeueChatChar(void);

2
src/s_sound.h
View file

@ -143,7 +143,7 @@ extern struct cursongcredit
{ {
musicdef_t *def; musicdef_t *def;
UINT16 anim; UINT16 anim;
INT32 x; fixed_t x;
UINT8 trans; UINT8 trans;
} cursongcredit; } cursongcredit;