fix main menu quick join keyboard/controller navigation

ReactiveDrop · Nov 12, 2023 · 6cc5e65 · 6cc5e65
1 parent 6104bf6
commit 6cc5e65
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/reactivedrop/resource/rd_event_config.txt b/reactivedrop/resource/rd_event_config.txt
@@ -9,7 +9,7 @@
 	"major4_url"	""
 	"major5_title"	""
 	"major5_url"	""
-	"patch"	"20230701"
+	"patch"	"20231201"
 	"event1_title"	"#rd_event_mapping_competition"
 	"event1_url"	"https://stats.reactivedrop.com/leaderboards/by-tag/bossfight2023?lang=%s"
 	"event1_starts"	"1682010000"

diff --git a/reactivedrop/resource/ui/basemodui/MainMenuLegacy.res b/reactivedrop/resource/ui/basemodui/MainMenuLegacy.res
@@ -296,6 +296,8 @@
 		"tall"					"300"
 		"xpos"					"c-200"
 		"ypos"					"r75"
+		"navLeft"				"PnlQuickJoinPublic"
+		"navRight"				"PnlQuickJoinPublic"
 	}
 
 	"PnlQuickJoinPublic"
@@ -308,6 +310,8 @@
 		"tall"					"300"
 		"xpos"					"c0"
 		"ypos"					"r75"
+		"navLeft"				"PnlQuickJoin"
+		"navRight"				"PnlQuickJoin"
 	}
 
 	"WorkshopDownloadProgress"

diff --git a/src/game/client/swarm/gameui/swarm/vquickjoin.cpp b/src/game/client/swarm/gameui/swarm/vquickjoin.cpp
@@ -501,10 +501,10 @@ void QuickJoinPanel::NavigateTo()
 	BaseModHybridButton *title = dynamic_cast< BaseModHybridButton* >( FindChildByName( "LblTitle" ) );
 	if ( title )
 	{
-		title->SetNavLeft( GetNavLeftPanel() );
-		title->SetNavRight( GetNavRightPanel() );
-		title->SetNavUp( GetNavUpPanel() );
-		title->SetNavDown( GetNavDownPanel() );
+		title->SetNavLeft( GetNavLeft() );
+		title->SetNavRight( GetNavRight() );
+		title->SetNavUp( GetNavUp() );
+		title->SetNavDown( GetNavDown() );
 		if ( m_bHasMouseover && title->IsVisible() && ( title->GetCurrentState() == BaseModHybridButton::Enabled || title->GetCurrentState() == BaseModHybridButton::Disabled ) )
 		{
 			title->NavigateTo();

diff --git a/src/game/client/swarm/vgui/rd_vgui_main_menu_top_bar.cpp b/src/game/client/swarm/vgui/rd_vgui_main_menu_top_bar.cpp
@@ -75,6 +75,10 @@ void CRD_VGUI_Main_Menu_Top_Bar::ApplySchemeSettings( vgui::IScheme *pScheme )
 	m_pTopButton[BTN_SWARMOPEDIA]->SetText( "#rd_collection_swarmopedia" );
 	m_pTopButton[BTN_WORKSHOP]->SetText( "#rd_mainmenu_workshop" );
 	m_pTopButton[BTN_INVENTORY]->SetText( "#rd_mainmenu_inventory" );
+
+#ifndef RD_7A_LOADOUTS
+	m_pTopButton[BTN_LOADOUTS]->SetVisible( false );
+#endif
 }
 
 extern void LaunchCollectionsFrame();

diff --git a/src/game/client/swarm/vgui/rd_vgui_settings_controls.cpp b/src/game/client/swarm/vgui/rd_vgui_settings_controls.cpp
@@ -409,7 +409,11 @@ void CRD_VGUI_Settings_Controls::Activate()
 {
 	NavigateToChild( m_pBindMoveForward );
 
+#ifdef RD_7A_CHATWHEEL
 	m_pBtnCustomWheels->SetEnabled( false ); // TODO!
+#else
+	m_pBtnCustomWheels->SetVisible( false );
+#endif
 }
 
 void CRD_VGUI_Settings_Controls::OnThink()

diff --git a/src/game/shared/swarm/rd_release_flags.h b/src/game/shared/swarm/rd_release_flags.h
@@ -12,9 +12,11 @@
 //#define RD__CAMPAIGNS_DEADCITY
 
 // 7th anniversary
+#define RD_7A_CHATWHEEL
 //#define RD_7A_CRAFTING
 //#define RD_7A_DROPS
 //#define RD_7A_ENEMIES
+#define RD_7A_LOADOUTS
 //#define RD_7A_QUESTS
 #define RD_7A_UI_REVAMP
 //#define RD_7A_WEAPONS