Skip to content

Commit

Permalink
fix loadout screen and main menu promo button respecting the swarmope…
Browse files Browse the repository at this point in the history
…dia grid setting
  • Loading branch information
BenLubar committed May 7, 2024
1 parent a254fc0 commit ff62851
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/game/client/swarm/gameui/swarm/vloadouts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,7 @@ CRD_VGUI_Loadout_Marine::CRD_VGUI_Loadout_Marine( vgui::Panel *parent, const cha
m_hLoadout = pLoadout;
m_pModelPanel = new CRD_Swarmopedia_Model_Panel( this, "ModelPanel" );
m_pModelPanel->m_eMode = CRD_Swarmopedia_Model_Panel::MODE_FULLSCREEN_MOUSE;
m_pModelPanel->m_bShouldDrawGrid = false;

m_pLblBiography = new vgui::MultiFontRichText( this, "LblBiography" );
m_pLblBiography->SetPanelInteractive( false );
Expand Down
1 change: 1 addition & 0 deletions src/game/client/swarm/gameui/swarm/vmainmenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ class CRD_VGUI_Main_Menu_Promo_Model_Viewer : public CRD_Swarmopedia_Model_Panel
m_flYawIntensity = 5.0f;
m_flPanSpeed = 2.5f;
m_angPanOrigin.Init( 40.0f, -15.0f, 0.0f );
m_bShouldDrawGrid = false;

RD_Swarmopedia::Display display;
display.Models.SetCount( 1 );
Expand Down
2 changes: 1 addition & 1 deletion src/game/client/swarm/rd_collections.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void CRD_Swarmopedia_Model_Panel::OnPaint3D()
m_Models[i].m_MDL.Draw( mat, Bones[i], m_Models[i].m_iRenderFlags );
}

if ( rd_swarmopedia_grid.GetBool() )
if ( rd_swarmopedia_grid.GetBool() && m_bShouldDrawGrid )
{
DrawGrid();
}
Expand Down
1 change: 1 addition & 0 deletions src/game/client/swarm/rd_collections.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class CRD_Swarmopedia_Model_Panel : public CASW_Model_Panel

bool m_bUseTimeScale{ true };
bool m_bAutoPosition{ true };
bool m_bShouldDrawGrid{ true };
Vector m_vecCenter;
float m_flRadius;

Expand Down

0 comments on commit ff62851

Please sign in to comment.