Skip to content

Fix ultra wide screen calculation mistakes introduced by refactoring. Bring minimap to front #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 3 commits into from
Jun 18, 2025
Merged

Fix ultra wide screen calculation mistakes introduced by refactoring. Bring minimap to front #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27e6987
Fix ultra wide screen cacluation mistakes introduced by refactoring. …
ywgATustcbbs Jun 17, 2025
7382a11
update traitors challenge - remove black restangles on ultra wide scr…
ywgATustcbbs Jun 17, 2025
d92f883
Remove FCVAR_ARCHIVE and FCVAR_NOTIFY bits from ultra wide screen cvars
ywgATustcbbs Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_player_info.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions src/game/client/swarm/vgui/asw_hud_master.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/game/client/swarm/vgui/asw_hud_minimap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ),
Expand Down