Bug fixes

This commit is contained in:
okvdai
2023-06-02 16:40:52 +02:00
parent 84ab278d92
commit da25a4dd29
4 changed files with 78 additions and 29 deletions
+57 -11
View File
@@ -124,6 +124,7 @@ void function MenuLobby_Init()
PrecacheHUDMaterial( $"ui/menu/main_menu/motd_background_happyhour" )
AddUICallback_OnLevelInit( OnLobbyLevelInit )
pulseGetData()
}
@@ -234,16 +235,46 @@ void function SetupComboButtonTest( var menu )
int headerIndex = 0
int buttonIndex = 0
file.playHeader = AddComboButtonHeader( comboStruct, headerIndex, "#MENU_HEADER_PLAY" )
file.findGameButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_TITLE_FIND_GAME" )
file.lobbyButtons.append( file.findGameButton )
Hud_AddEventHandler( file.findGameButton, UIE_CLICK, BigPlayButton1_Activate )
file.inviteRoomButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_TITLE_INVITE_ROOM" )
Hud_AddEventHandler( file.inviteRoomButton, UIE_CLICK, DoRoomInviteIfAllowed )
bool isModded = IsNorthstarServer()
// this will be the server browser
if ( isModded )
{
file.findGameButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_TITLE_SERVER_BROWSER" )
file.lobbyButtons.append( file.findGameButton )
Hud_SetLocked( file.findGameButton, true )
Hud_AddEventHandler( file.findGameButton, UIE_CLICK, OpenServerBrowser )
}
else
{
file.findGameButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_TITLE_FIND_GAME" )
file.lobbyButtons.append( file.findGameButton )
Hud_AddEventHandler( file.findGameButton, UIE_CLICK, BigPlayButton1_Activate )
}
// this is used for launching private matches now
if ( isModded )
{
file.inviteRoomButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#PRIVATE_MATCH" )
Hud_AddEventHandler( file.inviteRoomButton, UIE_CLICK, StartPrivateMatch )
}
else
{
file.inviteRoomButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_TITLE_INVITE_ROOM" )
Hud_AddEventHandler( file.inviteRoomButton, UIE_CLICK, DoRoomInviteIfAllowed )
}
file.inviteFriendsButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_TITLE_INVITE_FRIENDS" )
Hud_AddEventHandler( file.inviteFriendsButton, UIE_CLICK, InviteFriendsIfAllowed )
if ( isModded )
{
Hud_SetEnabled( file.inviteFriendsButton, false )
Hud_SetVisible( file.inviteFriendsButton, false )
}
// file.toggleMenuModeButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MENU_LOBBY_SWITCH_FD" )
// Hud_AddEventHandler( file.toggleMenuModeButton, UIE_CLICK, ToggleLobbyMode )
@@ -336,6 +367,16 @@ bool function MatchResultsExist()
return true // TODO
}
void function StartPrivateMatch( var button )
{
if ( Hud_IsLocked( button ) )
return
ClientCommand( "StartPrivateMatchSearch" )
NSSetLoading(true)
NSUpdateListenServer()
}
void function DoRoomInviteIfAllowed( var button )
{
if ( Hud_IsLocked( button ) )
@@ -1146,6 +1187,16 @@ void function SetUIPlayerCreditsInfo( var infoElement, int credits, int xp, int
RuiSetImage( rui, "callsignIcon", callsignIcon.image )
}
void function OpenServerBrowser( var button )
{
if ( Hud_IsLocked( button ) )
return
// nothing here yet lol
// look at OpenSelectedPlaylistMenu for advancing to server browser menu probably
AdvanceMenu( GetMenu( "ServerBrowserMenu" ) )
}
void function BigPlayButton1_Activate( var button )
{
if ( Hud_IsLocked( button ) )
@@ -1189,7 +1240,7 @@ function UpdateLobbyUI()
thread UpdateLobbyType()
thread UpdateMatchmakingStatus()
thread UpdateChatroomThread()
thread UpdateInviteJoinButton()
//thread UpdateInviteJoinButton()
thread UpdateInviteFriendsToNetworkButton()
thread UpdatePlayerInfo()
@@ -1578,8 +1629,3 @@ void function Lobby_SetFDModeBasedOnSearching( string playlistToSearch )
Lobby_SetFDMode( isFDMode )
}
void function pulseRefresh
{
pulseGetData()
}