From 27e69872719c7f7962332576b5e5315404a27fac Mon Sep 17 00:00:00 2001 From: ywgATustcbbs Date: Wed, 18 Jun 2025 02:15:05 +0800 Subject: [PATCH 1/3] Fix ultra wide screen cacluation mistakes introduced by refactoring. Bring minimap to front --- src/game/client/swarm/vgui/asw_hud_master.cpp | 4 ++-- src/game/client/swarm/vgui/asw_hud_minimap.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/client/swarm/vgui/asw_hud_master.cpp b/src/game/client/swarm/vgui/asw_hud_master.cpp index 4813088b2..0a665796b 100644 --- a/src/game/client/swarm/vgui/asw_hud_master.cpp +++ b/src/game/client/swarm/vgui/asw_hud_master.cpp @@ -450,8 +450,8 @@ void CASW_Hud_Master::OnThink() int nStandardWidth = (int)(g_nScreenAreaHeight * 16.0f / 9.0f ) + 1; if (g_nScreenAreaWidth > nStandardWidth) { - g_nRestrictedAreaLeft = nStandardWidth >> 1; - g_nRestrictedAreaRight = g_nScreenAreaWidth - (nStandardWidth >> 1); + g_nRestrictedAreaLeft = (g_nScreenAreaWidth - nStandardWidth) >> 1; + g_nRestrictedAreaRight = g_nScreenAreaWidth - g_nRestrictedAreaLeft; g_bUltraWideScreen = true; m_nMarinePortrait_x = g_nRestrictedAreaLeft; } diff --git a/src/game/client/swarm/vgui/asw_hud_minimap.cpp b/src/game/client/swarm/vgui/asw_hud_minimap.cpp index 95112cb00..e3ed59703 100644 --- a/src/game/client/swarm/vgui/asw_hud_minimap.cpp +++ b/src/game/client/swarm/vgui/asw_hud_minimap.cpp @@ -142,7 +142,7 @@ class CASWHudMinimapFramePanel : public vgui::Panel }; -DECLARE_HUDELEMENT( CASWHudMinimap ); +DECLARE_HUDELEMENT_DEPTH( CASWHudMinimap, 40 ); CASWHudMinimapLinePanel::CASWHudMinimapLinePanel( Panel *parent, const char *panelName, CASWHudMinimap *pMap ) : vgui::Panel( parent, panelName ), From 7382a115b489a1590af9e9429e31b0a1b6a5924a Mon Sep 17 00:00:00 2001 From: ywgATustcbbs Date: Wed, 18 Jun 2025 02:25:40 +0800 Subject: [PATCH 2/3] update traitors challenge - remove black restangles on ultra wide screens --- .../scripts/vscripts/challenge_traitors_player_info.nut | 5 ----- 1 file changed, 5 deletions(-) diff --git a/reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_player_info.nut b/reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_player_info.nut index ca53316a9..6cc2d4271 100644 --- a/reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_player_info.nut +++ b/reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_player_info.nut @@ -81,11 +81,6 @@ function PaintMsg(point, role, font, message) { local textHalfWidth = 0.5 * self.GetTextWide(font, message); SetMargin(); local alpha = 255; - if (xMargin != 0) { - self.PaintRectangle(0, 0, xMargin, ScreenHeight() * 0.91, 0, 0, 0, alpha); - self.PaintRectangle(ScreenHeight() * 0.315, ScreenHeight() * 0.91, xMargin, ScreenHeight(), 0, 0, 0, alpha); - self.PaintRectangle(ScreenWidth() - xMargin, 0, ScreenWidth(), ScreenHeight(), 0, 0, 0, alpha); - } local xOffset = point[0] >= textHalfWidth + 20 ? 0 : textHalfWidth + 20 - point[0]; point[0] += xOffset; if (role <= ROLE.MAX_IAF_TEAM) { From d92f883f1df38f94411565ad81a7459a1fc93e01 Mon Sep 17 00:00:00 2001 From: "ywg@ustcbbs" Date: Wed, 18 Jun 2025 03:51:43 +0800 Subject: [PATCH 3/3] Remove FCVAR_ARCHIVE and FCVAR_NOTIFY bits from ultra wide screen cvars --- src/game/client/swarm/vgui/asw_hud_master.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/client/swarm/vgui/asw_hud_master.cpp b/src/game/client/swarm/vgui/asw_hud_master.cpp index 0a665796b..9016c1895 100644 --- a/src/game/client/swarm/vgui/asw_hud_master.cpp +++ b/src/game/client/swarm/vgui/asw_hud_master.cpp @@ -54,8 +54,8 @@ bool g_bUltraWideScreen; // restricted area cvars ConVar rd_draw_restricted_borders( "rd_draw_restricted_borders", "1", FCVAR_ARCHIVE, "Display the restricted cursor area when using ultra-wide resolution" ); ConVar rd_draw_restricted_borders_color("rd_draw_restricted_borders_color", "128 128 128 128", 0, "Color of the restricted cursor area borders"); -ConVar rd_draw_restricted_rectangles_coop("rd_draw_restricted_rectangles_coop", "1", FCVAR_ARCHIVE | FCVAR_REPLICATED | FCVAR_NOTIFY, "Fill extra side FOVs with black on ultra-wide resolution in coop mode."); -ConVar rd_draw_restricted_rectangles_dm("rd_draw_restricted_rectangles_dm", "1", FCVAR_ARCHIVE | FCVAR_REPLICATED | FCVAR_CHEAT | FCVAR_NOTIFY, "Fill extra side FOVs with black on ultra-wide resolution in deathmatch mode."); +ConVar rd_draw_restricted_rectangles_coop("rd_draw_restricted_rectangles_coop", "1", FCVAR_REPLICATED, "Fill extra side FOVs with black on ultra-wide resolution in coop mode."); +ConVar rd_draw_restricted_rectangles_dm("rd_draw_restricted_rectangles_dm", "1", FCVAR_REPLICATED | FCVAR_CHEAT, "Fill extra side FOVs with black on ultra-wide resolution in deathmatch mode."); using namespace vgui;