diff options
Diffstat (limited to 'Northstar.Client/mod/scripts/vscripts/ui')
| -rw-r--r-- | Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut | 53 | ||||
| -rw-r--r-- | Northstar.Client/mod/scripts/vscripts/ui/panel_mainmenu.nut | 4 |
2 files changed, 10 insertions, 47 deletions
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut index fb74a6f5..26a157bf 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut @@ -83,47 +83,6 @@ bool function floatCompareInRange(float arg1, float arg2, float tolerance) } - -// Hard coded for now -array<string> function GetNorthstarGamemodes() -{ - array<string> modes - - //modes.append( "#PL_aitdm" ) - modes.append( "#PL_pilot_hunter" ) - modes.append( "#PL_hardpoint" ) - //modes.append( "#PL_attrition" ) - modes.append( "#PL_capture_the_flag" ) - modes.append( "#PL_last_titan_standing" ) - modes.append( "#PL_pilot_skirmish" ) - modes.append( "#PL_live_fire" ) - modes.append( "#PL_marked_for_death" ) - modes.append( "#PL_titan_brawl" ) - //modes.append( "#PL_fd_easy" ) - //modes.append( "#PL_fd_normal" ) - //modes.append( "#PL_fd_hard" ) - //modes.append( "#PL_fd_master" ) - //modes.append( "#PL_fd_insane" ) - modes.append( "#PL_ffa" ) - modes.append( "#PL_fra" ) - modes.append( "#PL_coliseum" ) - modes.append( "#PL_aegis_titan_brawl" ) - modes.append( "#PL_titan_brawl_turbo" ) - modes.append( "#PL_aegis_last_titan_standing" ) - modes.append( "#PL_turbo_last_titan_standing" ) - modes.append( "#PL_rocket_arena" ) - modes.append( "#PL_all_holopilot" ) - modes.append( "#PL_gg" ) - modes.append( "#PL_tt" ) - modes.append( "#PL_inf" ) - modes.append( "#PL_kr" ) - modes.append( "#PL_fastball" ) - modes.append( "#GAMEMODE_hs" ) - modes.append( "#GAMEMODE_ctf_comp" ) - - - return modes -} //////////////////////////// // Init //////////////////////////// @@ -154,7 +113,7 @@ void function InitServerBrowserMenu() Hud_DialogList_AddListItem( Hud_GetChild( file.menu, "SwtBtnSelectMap" ) , map, string( enum_ ) ) - filterArguments.filterGamemodes = GetNorthstarGamemodes() + filterArguments.filterGamemodes = clone GetPrivateMatchModes() filterArguments.filterGamemodes.insert(0, "SWITCH_ANY") // GetGameModeDisplayName( mode ) requires server talk even if it can be entirely client side @@ -405,9 +364,13 @@ void function UpdateServerInfoBasedOnRes() //////////////////////////// void function OnCloseServerBrowserMenu() { - DeregisterButtonPressedCallback(MOUSE_WHEEL_UP , OnScrollUp) - DeregisterButtonPressedCallback(MOUSE_WHEEL_DOWN , OnScrollDown) - DeregisterButtonPressedCallback(KEY_TAB , OnKeyTabPressed) + try + { + DeregisterButtonPressedCallback(MOUSE_WHEEL_UP , OnScrollUp) + DeregisterButtonPressedCallback(MOUSE_WHEEL_DOWN , OnScrollDown) + DeregisterButtonPressedCallback(KEY_TAB , OnKeyTabPressed) + } + catch ( ex ) {} } void function OnServerBrowserMenuOpened() diff --git a/Northstar.Client/mod/scripts/vscripts/ui/panel_mainmenu.nut b/Northstar.Client/mod/scripts/vscripts/ui/panel_mainmenu.nut index 25097c6f..ecb34d47 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/panel_mainmenu.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/panel_mainmenu.nut @@ -502,9 +502,9 @@ void function TryUnlockNorthstarButton() // unlock "Launch Northstar" button until you're authed with masterserver, are allowing insecure auth, or 7.5 seconds have passed float time = Time() - while ( Time() < time + 7.5 || GetConVarInt( "ns_has_agreed_to_send_token" ) != NS_AGREED_TO_SEND_TOKEN ) + while ( GetConVarInt( "ns_has_agreed_to_send_token" ) != NS_AGREED_TO_SEND_TOKEN ) { - if ( NSIsMasterServerAuthenticated() || GetConVarBool( "ns_auth_allow_insecure" ) ) + if ( ( NSIsMasterServerAuthenticated() && IsStryderAllowingMP() ) || GetConVarBool( "ns_auth_allow_insecure" ) ) break WaitFrame() |