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

Y_PlayerStandingsDrawer: Add slide in from bottom of screen for Pause

Browse source 
In the process makes all y coordinates in the function relative to a base y, so it's less fragile to future maintenance.
This commit is contained in:
toaster 2023-06-04 12:49:08 +01:00
parent 6ae7f1f64f
commit 36191fa4db
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_menudraw.c
View file

@ -4378,13 +4378,13 @@ void M_DrawPause(void)
if (smallroundpatch != NULL) if (smallroundpatch != NULL)
{ {
V_DrawMappedPatch( V_DrawMappedPatch(
24, 152, 24, 152 + offset/2,
0, 0,
smallroundpatch, smallroundpatch,
NULL); NULL);
} }
Y_RoundQueueDrawer(&standings, false, false); Y_RoundQueueDrawer(&standings, offset/2, false, false);
} }
} }

40
src/y_inter.c
View file

@ -660,9 +660,9 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset)
// Y_RoundQueueDrawer // Y_RoundQueueDrawer
// //
// Handles drawing the bottom-of-screen progression. // Handles drawing the bottom-of-screen progression.
// Currently requires intermission y_data to be active, but abstraction is feasible. // Currently requires intermission y_data for animation only.
// //
void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean widescreen) void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations, boolean widescreen)
{ {
if (roundqueue.size == 0) if (roundqueue.size == 0)
{ {
@ -766,7 +766,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
INT32 widthofroundqueue = 24*(workingqueuesize - 1); INT32 widthofroundqueue = 24*(workingqueuesize - 1);
INT32 x = (BASEVIDWIDTH - widthofroundqueue) / 2; INT32 x = (BASEVIDWIDTH - widthofroundqueue) / 2;
INT32 y; INT32 y, basey = 167 + offset;
INT32 spacetospecial = 0; INT32 spacetospecial = 0;
@ -829,13 +829,13 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
if (upwa == true) if (upwa == true)
{ {
xiter -= 24; xiter -= 24;
V_DrawMappedPatch(xiter, 167, baseflags, queuebg_upwa, greymap); V_DrawMappedPatch(xiter, basey, baseflags, queuebg_upwa, greymap);
} }
while (xiter > -bufferspace) while (xiter > -bufferspace)
{ {
xiter -= 24; xiter -= 24;
V_DrawMappedPatch(xiter, 167, baseflags, queuebg_flat, greymap); V_DrawMappedPatch(xiter, basey, baseflags, queuebg_flat, greymap);
} }
for (i = 0; i < workingqueuesize; i++) for (i = 0; i < workingqueuesize; i++)
@ -846,9 +846,9 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
upwa ^= true; upwa ^= true;
if (upwa == false) if (upwa == false)
{ {
y = 171; y = basey + 4;
V_DrawMappedPatch(x, 167, baseflags, queuebg_down, greymap); V_DrawMappedPatch(x, basey, baseflags, queuebg_down, greymap);
if (i+1 != workingqueuesize) // no more line? if (i+1 != workingqueuesize) // no more line?
{ {
@ -857,17 +857,17 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
} }
else else
{ {
y = 179; y = basey + 12;
if (i+1 != workingqueuesize) // no more line? if (i+1 != workingqueuesize) // no more line?
{ {
V_DrawMappedPatch(x, 167, baseflags, queuebg_upwa, greymap); V_DrawMappedPatch(x, basey, baseflags, queuebg_upwa, greymap);
choose_line = line_upwa; choose_line = line_upwa;
} }
else else
{ {
V_DrawMappedPatch(x, 167, baseflags, queuebg_flat, greymap); V_DrawMappedPatch(x, basey, baseflags, queuebg_flat, greymap);
} }
} }
@ -936,7 +936,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
// Draw the line to the right of the dot // Draw the line to the right of the dot
V_DrawMappedPatch( V_DrawMappedPatch(
x - 1, 178, x - 1, basey + 11,
baseflags, baseflags,
choose_line[BPP_SHADOW], choose_line[BPP_SHADOW],
NULL NULL
@ -969,7 +969,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
else else
{ {
V_DrawMappedPatch( V_DrawMappedPatch(
x - 1, 179, x - 1, basey + 12,
baseflags, baseflags,
choose_line[BPP_DONE], choose_line[BPP_DONE],
colormap colormap
@ -988,7 +988,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
} }
V_DrawMappedPatch( V_DrawMappedPatch(
x - 1, 179, x - 1, basey + 12,
baseflags, baseflags,
choose_line[lineisfull ? BPP_DONE : BPP_AHEAD], choose_line[lineisfull ? BPP_DONE : BPP_AHEAD],
lineisfull ? colormap : NULL lineisfull ? colormap : NULL
@ -1006,7 +1006,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
while (xiter < BASEVIDWIDTH + bufferspace) while (xiter < BASEVIDWIDTH + bufferspace)
{ {
xiter += 24; xiter += 24;
V_DrawMappedPatch(xiter, 167, baseflags, queuebg_flat, greymap); V_DrawMappedPatch(xiter, basey, baseflags, queuebg_flat, greymap);
} }
// Handle special entry on the end // Handle special entry on the end
@ -1068,7 +1068,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
} }
// Special background bump // Special background bump
V_DrawMappedPatch(x2 - 13, 167, baseflags, queuebg_prize, greymap); V_DrawMappedPatch(x2 - 13, basey, baseflags, queuebg_prize, greymap);
// Draw the final line // Draw the final line
const fixed_t barstart = x + 6; const fixed_t barstart = x + 6;
@ -1095,14 +1095,14 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
while (xiter < fillend) while (xiter < fillend)
{ {
V_DrawMappedPatch( V_DrawMappedPatch(
xiter - 1, 177, xiter - 1, basey + 10,
baseflags, baseflags,
line_flat[BPP_SHADOW], line_flat[BPP_SHADOW],
NULL NULL
); );
V_DrawMappedPatch( V_DrawMappedPatch(
xiter - 1, 179, xiter - 1, basey + 12,
baseflags, baseflags,
line_flat[BPP_DONE], line_flat[BPP_DONE],
colormap colormap
@ -1128,14 +1128,14 @@ void Y_RoundQueueDrawer(y_data_t *standings, boolean doanimations, boolean wides
while (xiter < barend) while (xiter < barend)
{ {
V_DrawMappedPatch( V_DrawMappedPatch(
xiter - 1, 177, xiter - 1, basey + 10,
baseflags, baseflags,
line_flat[BPP_SHADOW], line_flat[BPP_SHADOW],
NULL NULL
); );
V_DrawMappedPatch( V_DrawMappedPatch(
xiter - 1, 179, xiter - 1, basey + 12,
baseflags, baseflags,
line_flat[lineisfull ? BPP_DONE : BPP_AHEAD], line_flat[lineisfull ? BPP_DONE : BPP_AHEAD],
lineisfull ? colormap : NULL lineisfull ? colormap : NULL
@ -1391,7 +1391,7 @@ skiptallydrawer:
goto finalcounter; goto finalcounter;
// Returns early if there's no roundqueue entries to draw // Returns early if there's no roundqueue entries to draw
Y_RoundQueueDrawer(&data, true, false); Y_RoundQueueDrawer(&data, 0, true, false);
if (netgame) if (netgame)
{ {

2
src/y_inter.h
View file

@ -49,7 +49,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, boolean doanimations, boolean widescreen); void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations, boolean widescreen);
void Y_StartIntermission(void); void Y_StartIntermission(void);
void Y_EndIntermission(void); void Y_EndIntermission(void);