thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'widescreen-a' into 'master'

Browse source 
Widescreen support for Y_IntermissionButton

See merge request KartKrew/Kart!2256
This commit is contained in:
James R. 2024-04-11 03:06:43 +00:00
commit da82b4c9c7
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/f_finale.c
View file

@ -1361,7 +1361,7 @@ void F_GameEvaluationDrawer(void)
V_DrawCenteredString(BASEVIDWIDTH/2, 182, V_SNAPTOBOTTOM|(ultimatemode ? V_REDMAP : V_YELLOWMAP), endingtext); V_DrawCenteredString(BASEVIDWIDTH/2, 182, V_SNAPTOBOTTOM|(ultimatemode ? V_REDMAP : V_YELLOWMAP), endingtext);
} }
Y_DrawIntermissionButton(EVALLEN_HALFWAY + TICRATE - finalecount, (finalecount + TICRATE) - timetonext); Y_DrawIntermissionButton(EVALLEN_HALFWAY + TICRATE - finalecount, (finalecount + TICRATE) - timetonext, true);
} }
void F_GameEvaluationTicker(void) void F_GameEvaluationTicker(void)

4
src/k_podium.cpp
View file

@ -935,11 +935,11 @@ void podiumData_s::Draw(void)
if (state == PODIUM_ST_DONE) if (state == PODIUM_ST_DONE)
{ {
Y_DrawIntermissionButton(delay, 0); Y_DrawIntermissionButton(delay, 0, true);
} }
else if (state == PODIUM_ST_EXIT) else if (state == PODIUM_ST_EXIT)
{ {
Y_DrawIntermissionButton(-1, (2*TICRATE) - delay); Y_DrawIntermissionButton(-1, (2*TICRATE) - delay, true);
} }
} }
} }

9
src/y_inter.cpp
View file

@ -1429,7 +1429,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations,
// //
// It's a button that slides at the given time // It's a button that slides at the given time
// //
void Y_DrawIntermissionButton(INT32 startslide, INT32 through) void Y_DrawIntermissionButton(INT32 startslide, INT32 through, boolean widescreen)
{ {
INT32 percentslide = 0; INT32 percentslide = 0;
const INT32 slidetime = (TICRATE/4); const INT32 slidetime = (TICRATE/4);
@ -1476,7 +1476,10 @@ void Y_DrawIntermissionButton(INT32 startslide, INT32 through)
K_drawButton( K_drawButton(
2*FRACUNIT - offset, 2*FRACUNIT - offset,
(BASEVIDHEIGHT - 16)*FRACUNIT, (BASEVIDHEIGHT - 16)*FRACUNIT,
0, (widescreen
? (V_SNAPTOLEFT|V_SNAPTOBOTTOM)
: 0
),
kp_button_a[1], kp_button_a[1],
pressed pressed
); );
@ -1714,7 +1717,7 @@ finalcounter:
if (Y_CanSkipIntermission()) if (Y_CanSkipIntermission())
{ {
const tic_t end = roundqueue.size != 0 ? 3*TICRATE : TICRATE; const tic_t end = roundqueue.size != 0 ? 3*TICRATE : TICRATE;
Y_DrawIntermissionButton(INTERBUTTONSLIDEIN - intertic, end - timer); Y_DrawIntermissionButton(INTERBUTTONSLIDEIN - intertic, end - timer, false);
} }
else else
{ {

2
src/y_inter.h
View file

@ -56,7 +56,7 @@ void Y_Ticker(void);
// Specific sub-drawers // Specific sub-drawers
void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset); void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset);
void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations, boolean widescreen); void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations, boolean widescreen);
void Y_DrawIntermissionButton(INT32 startslide, INT32 through); void Y_DrawIntermissionButton(INT32 startslide, INT32 through, boolean widescreen);
void Y_StartIntermission(void); void Y_StartIntermission(void);
void Y_EndIntermission(void); void Y_EndIntermission(void);