From 54cd540e5b2dd3b7a99eb637d89bfb1b2656a65a Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 14 Feb 2022 14:41:34 +0000 Subject: [PATCH 1/2] Fix the chat underlay being physically seperated from the chat text in non-green resolutions. --- src/v_video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/v_video.c b/src/v_video.c index 147e3892f..60764ccbd 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -997,7 +997,8 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c) w *= dupx; h *= dupy; - // adjustxy + // Center it if necessary + K_AdjustXYWithSnap(&x, &y, c, dupx, dupy); } if (x >= vid.width || y >= vid.height) From 9ef2530e543fde7e5e4124ae65c6bca2b2c8a5fb Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 14 Feb 2022 14:42:31 +0000 Subject: [PATCH 2/2] Fix HUD tracking being broken in non-green aspect ratios. --- src/k_hud.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 62253ba68..a15f24409 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -865,8 +865,8 @@ void K_ObjectTracking(trackingResult_t *result, vector3_t *point, UINT8 cameraNu // Calculate screen size adjustments. // TODO: Anyone want to make this support non-green resolutions somehow? :V - screenWidth = BASEVIDWIDTH; - screenHeight = BASEVIDHEIGHT; + screenWidth = vid.width/vid.dupx; + screenHeight = vid.height/vid.dupy; if (r_splitscreen >= 2) { @@ -925,6 +925,10 @@ void K_ObjectTracking(trackingResult_t *result, vector3_t *point, UINT8 cameraNu result->onScreen = false; } + // adjust to non-green-resolution screen coordinates + result->x -= ((vid.width/vid.dupx) - BASEVIDWIDTH)<<(FRACBITS-((r_splitscreen >= 2) ? 2 : 1)); + result->y -= ((vid.height/vid.dupy) - BASEVIDHEIGHT)<<(FRACBITS-((r_splitscreen >= 1) ? 2 : 1)); + return; #undef NEWTAN