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 'tally-169' into 'master'

Browse source 
Non-green HUD fixes: Tally, FREE PLAY, server splash

See merge request KartKrew/Kart!1560
This commit is contained in:
Oni 2023-10-19 06:51:20 +00:00
commit 1a0c56fcbf
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_hud.c
View file

@ -5106,7 +5106,7 @@ void K_drawKartFreePlay(void)
if (((leveltime-lt_endtime) % TICRATE) < TICRATE/2) if (((leveltime-lt_endtime) % TICRATE) < TICRATE/2)
return; return;
INT32 h_snap = (r_splitscreen < 2 || R_GetViewNumber() & 1) ? V_SNAPTORIGHT : V_SNAPTOLEFT; INT32 h_snap = r_splitscreen < 2 ? V_SNAPTORIGHT | V_SLIDEIN : V_HUDTRANS;
fixed_t x = ((r_splitscreen > 1 ? BASEVIDWIDTH/4 : BASEVIDWIDTH - (LAPS_X+6)) * FRACUNIT); fixed_t x = ((r_splitscreen > 1 ? BASEVIDWIDTH/4 : BASEVIDWIDTH - (LAPS_X+6)) * FRACUNIT);
fixed_t y = ((r_splitscreen ? BASEVIDHEIGHT/2 : BASEVIDHEIGHT) - 20) * FRACUNIT; fixed_t y = ((r_splitscreen ? BASEVIDHEIGHT/2 : BASEVIDHEIGHT) - 20) * FRACUNIT;
@ -5114,7 +5114,7 @@ void K_drawKartFreePlay(void)
FRACUNIT, FRACUNIT,
FRACUNIT, FRACUNIT,
FRACUNIT, FRACUNIT,
V_HUDTRANS|V_SLIDEIN|V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN, V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN,
KART_FONT, KART_FONT,
"FREE PLAY" "FREE PLAY"
) / (r_splitscreen > 1 ? 2 : 1); ) / (r_splitscreen > 1 ? 2 : 1);
@ -5125,7 +5125,7 @@ void K_drawKartFreePlay(void)
FRACUNIT, FRACUNIT,
FRACUNIT, FRACUNIT,
FRACUNIT, FRACUNIT,
V_HUDTRANS|V_SLIDEIN|V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN, V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN,
NULL, NULL,
KART_FONT, KART_FONT,
"FREE PLAY" "FREE PLAY"

9
src/k_tally.cpp
View file

@ -909,10 +909,13 @@ void level_tally_t::Draw(void)
{ {
fade = (5 * transition_f); fade = (5 * transition_f);
} }
V_DrawFadeFill( V_DrawFadeFill(
0, 0, (vid.width / 2) * (r_splitscreen > 1 && R_GetViewNumber() & 1),
v_width, v_height, (vid.height / 2) * (R_GetViewNumber() > (r_splitscreen > 1)),
V_SPLITSCREEN, vid.width / (r_splitscreen > 1 ? 2 : 1),
vid.height / (r_splitscreen ? 2 : 1),
V_NOSCALESTART,
31, fade 31, fade
); );

6
src/st_stuff.c
View file

@ -1351,7 +1351,7 @@ void ST_DrawServerSplash(boolean timelimited)
V_DrawFixedPatch( V_DrawFixedPatch(
gridX, gridY, gridX, gridY,
FRACUNIT, FRACUNIT,
(V_SNAPTOLEFT|V_SNAPTOBOTTOM) | V_SUBTRACT | V_VFLIP | gridOpacity, (V_SNAPTOLEFT|V_SNAPTOTOP) | V_SUBTRACT | V_VFLIP | gridOpacity,
gridPatch, gridPatch,
NULL NULL
); );
@ -1369,7 +1369,7 @@ void ST_DrawServerSplash(boolean timelimited)
V_DrawFixedPatch( V_DrawFixedPatch(
iconX, iconY, iconX, iconY,
FRACUNIT, FRACUNIT,
(V_SNAPTORIGHT|V_SNAPTOBOTTOM) | opacityFlag, (V_SNAPTORIGHT|V_SNAPTOTOP) | opacityFlag,
iconPatch, iconPatch,
NULL NULL
); );
@ -1379,7 +1379,7 @@ void ST_DrawServerSplash(boolean timelimited)
V_DrawRightAlignedStringAtFixed( V_DrawRightAlignedStringAtFixed(
textX, textY, textX, textY,
(V_SNAPTORIGHT|V_SNAPTOBOTTOM) | opacityFlag, (V_SNAPTORIGHT|V_SNAPTOTOP) | opacityFlag,
connectedservername connectedservername
); );