From 170133dac22c74586884033a5d786c9ac8dbfefe Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 17 Oct 2023 19:16:51 -0700 Subject: [PATCH 1/3] HUD: fix FREE PLAY showing up on Tally in non-green resolutions --- src/k_hud.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index d3fc3cd14..8a0c241f6 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -5106,7 +5106,7 @@ void K_drawKartFreePlay(void) if (((leveltime-lt_endtime) % TICRATE) < TICRATE/2) 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 y = ((r_splitscreen ? BASEVIDHEIGHT/2 : BASEVIDHEIGHT) - 20) * FRACUNIT; @@ -5114,7 +5114,7 @@ void K_drawKartFreePlay(void) FRACUNIT, FRACUNIT, FRACUNIT, - V_HUDTRANS|V_SLIDEIN|V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN, + V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN, KART_FONT, "FREE PLAY" ) / (r_splitscreen > 1 ? 2 : 1); @@ -5125,7 +5125,7 @@ void K_drawKartFreePlay(void) FRACUNIT, FRACUNIT, FRACUNIT, - V_HUDTRANS|V_SLIDEIN|V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN, + V_SNAPTOBOTTOM|h_snap|V_SPLITSCREEN, NULL, KART_FONT, "FREE PLAY" From 3977d3225dfea3faabcc4a70404b1e3583e6540d Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 17 Oct 2023 19:17:46 -0700 Subject: [PATCH 2/3] Tally: fix fade not covering entire screen in non-green resolutions --- src/k_tally.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/k_tally.cpp b/src/k_tally.cpp index 36f5ed0d1..eba1452c8 100644 --- a/src/k_tally.cpp +++ b/src/k_tally.cpp @@ -909,10 +909,13 @@ void level_tally_t::Draw(void) { fade = (5 * transition_f); } + V_DrawFadeFill( - 0, 0, - v_width, v_height, - V_SPLITSCREEN, + (vid.width / 2) * (r_splitscreen > 1 && R_GetViewNumber() & 1), + (vid.height / 2) * (R_GetViewNumber() > (r_splitscreen > 1)), + vid.width / (r_splitscreen > 1 ? 2 : 1), + vid.height / (r_splitscreen ? 2 : 1), + V_NOSCALESTART, 31, fade ); From ecc324e4d802fac06685c00dcff977c44688c199 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 17 Oct 2023 19:18:00 -0700 Subject: [PATCH 3/3] HUD: fix server splash alignment in non-green resolutions --- src/st_stuff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 451de0f16..305f50266 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1351,7 +1351,7 @@ void ST_DrawServerSplash(boolean timelimited) V_DrawFixedPatch( gridX, gridY, FRACUNIT, - (V_SNAPTOLEFT|V_SNAPTOBOTTOM) | V_SUBTRACT | V_VFLIP | gridOpacity, + (V_SNAPTOLEFT|V_SNAPTOTOP) | V_SUBTRACT | V_VFLIP | gridOpacity, gridPatch, NULL ); @@ -1369,7 +1369,7 @@ void ST_DrawServerSplash(boolean timelimited) V_DrawFixedPatch( iconX, iconY, FRACUNIT, - (V_SNAPTORIGHT|V_SNAPTOBOTTOM) | opacityFlag, + (V_SNAPTORIGHT|V_SNAPTOTOP) | opacityFlag, iconPatch, NULL ); @@ -1379,7 +1379,7 @@ void ST_DrawServerSplash(boolean timelimited) V_DrawRightAlignedStringAtFixed( textX, textY, - (V_SNAPTORIGHT|V_SNAPTOBOTTOM) | opacityFlag, + (V_SNAPTORIGHT|V_SNAPTOTOP) | opacityFlag, connectedservername );