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

Adjust the bannerx system (used both by titlecard and boss titlecard) to actively scale with the resolution, instead of blindly drawing three times.

Browse source
This commit is contained in:
toaster 2022-03-05 23:26:58 +00:00
parent 6f33cd7ce6
commit 98bf8a414d
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/st_stuff.c
View file

@ -819,7 +819,7 @@ void ST_runTitleCard(void)
} }
} }
// No matter the circumstances, scroll the WARN... // No matter the circumstances, scroll the WARN...
bannerx = -(lt_ticker%((encoremode ? twarn2 : twarn)->width)); bannerx = -((lt_ticker*2)%((encoremode ? twarn2 : twarn)->width));
} }
else else
{ {
@ -944,7 +944,7 @@ void ST_runTitleCard(void)
} }
// No matter the circumstances, scroll the banner... // No matter the circumstances, scroll the banner...
bannerx = -(lt_ticker%(tcbanner->width)); bannerx = -((lt_ticker*2)%(tcbanner->width));
} }
@ -969,10 +969,9 @@ void ST_drawTitleCard(void)
fixed_t actscale; fixed_t actscale;
angle_t fakeangle; angle_t fakeangle;
INT32 pad = ((vid.width/vid.dupx) - BASEVIDWIDTH)/2;
INT32 bx = bannerx; // We need to make a copy of that otherwise pausing will cause problems. INT32 bx = bannerx; // We need to make a copy of that otherwise pausing will cause problems.
UINT8 i;
if (!G_IsTitleCardAvailable()) if (!G_IsTitleCardAvailable())
return; return;
@ -1001,7 +1000,7 @@ void ST_drawTitleCard(void)
INT32 transp = (lt_ticker+HITIME) % (LOTIME+HITIME); INT32 transp = (lt_ticker+HITIME) % (LOTIME+HITIME);
boolean encorehack = (encoremode && lt_ticker <= PRELEVELTIME+4); boolean encorehack = (encoremode && lt_ticker <= PRELEVELTIME+4);
if (lt_ticker + (HITIME-transp) <= lt_endtime) if ((localwarn->width > 0) && (lt_ticker + (HITIME-transp) <= lt_endtime))
{ {
if (transp > HITIME-1) if (transp > HITIME-1)
{ {
@ -1010,9 +1009,11 @@ void ST_drawTitleCard(void)
transp = (((10*transp)/HITIME)<<V_ALPHASHIFT) | (encorehack ? V_SUBTRACT : V_ADD); transp = (((10*transp)/HITIME)<<V_ALPHASHIFT) | (encorehack ? V_SUBTRACT : V_ADD);
for (i=0; i < 3; i++) while (bx > -pad)
bx -= localwarn->width;
while (bx < BASEVIDWIDTH+pad)
{ {
V_DrawFixedPatch((bannerx + bx)*FRACUNIT, 55*FRACUNIT, FRACUNIT, V_SNAPTOLEFT|transp, localwarn, NULL); V_DrawFixedPatch(bx*FRACUNIT, 55*FRACUNIT, FRACUNIT, V_SNAPTOLEFT|transp, localwarn, NULL);
bx += localwarn->width; bx += localwarn->width;
} }
} }
@ -1098,11 +1099,16 @@ void ST_drawTitleCard(void)
// round num background // round num background
V_DrawFixedPatch(roundnumx*FRACUNIT, roundnumy*FRACUNIT, FRACUNIT, V_SNAPTOBOTTOM|V_SNAPTOLEFT, tccirclebg, NULL); V_DrawFixedPatch(roundnumx*FRACUNIT, roundnumy*FRACUNIT, FRACUNIT, V_SNAPTOBOTTOM|V_SNAPTOLEFT, tccirclebg, NULL);
// Scrolling banner, we'll draw 3 of those back to back. // Scrolling banner
for (i=0; i < 3; i++) if (tcbanner->width > 0)
{ {
V_DrawFixedPatch((bannerx + bx)*FRACUNIT, (bannery)*FRACUNIT, FRACUNIT, V_SNAPTOBOTTOM|V_SNAPTOLEFT, tcbanner, NULL); while (bx > -pad)
bx += tcbanner->width; bx -= tcbanner->width;
while (bx < BASEVIDWIDTH+pad)
{
V_DrawFixedPatch(bx*FRACUNIT, (bannery)*FRACUNIT, FRACUNIT, V_SNAPTOBOTTOM|V_SNAPTOLEFT, tcbanner, NULL);
bx += tcbanner->width;
}
} }
// If possible, draw round number // If possible, draw round number