From 2c36b047dd934fec2e27de3de05d213a25c64b4a Mon Sep 17 00:00:00 2001 From: Oni Date: Wed, 4 Oct 2023 05:28:45 +0000 Subject: [PATCH] Merge branch 'fix-splitscreen-hud-tracking-bleed' into 'master' K_drawKartNameTags: crop HUD tracking to splitscreen viewports See merge request KartKrew/Kart!1542 --- src/k_hud.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/k_hud.c b/src/k_hud.c index f2ad6f0c3..ee91c3fe6 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -2713,6 +2713,31 @@ static void K_drawKartNameTags(void) return; } + // Crop within splitscreen bounds + switch (r_splitscreen) + { + case 1: + V_SetClipRect( + 0, + cnum == 1 ? (BASEVIDHEIGHT / 2) * FRACUNIT : 0, + BASEVIDWIDTH * FRACUNIT, + (BASEVIDHEIGHT / 2) * FRACUNIT, + 0 + ); + break; + + case 2: + case 3: + V_SetClipRect( + cnum & 1 ? (BASEVIDWIDTH / 2) * FRACUNIT : 0, + cnum > 1 ? (BASEVIDHEIGHT / 2) * FRACUNIT : 0, + (BASEVIDWIDTH / 2) * FRACUNIT, + (BASEVIDHEIGHT / 2) * FRACUNIT, + 0 + ); + break; + } + c.x = viewx; c.y = viewy; c.z = viewz; @@ -2942,6 +2967,8 @@ static void K_drawKartNameTags(void) } } } + + V_ClearClipRect(); } static void K_drawKartMinimapIcon(fixed_t objx, fixed_t objy, INT32 hudx, INT32 hudy, INT32 flags, patch_t *icon, UINT8 *colormap)