aboutsummaryrefslogtreecommitdiff
path: root/Northstar.Client/mod/scripts/vscripts/ui
diff options
context:
space:
mode:
Diffstat (limited to 'Northstar.Client/mod/scripts/vscripts/ui')
-rw-r--r--Northstar.Client/mod/scripts/vscripts/ui/_menus.nut2
-rw-r--r--Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut2
-rw-r--r--Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut12
3 files changed, 2 insertions, 14 deletions
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 90a535ee..c83381fd 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -187,6 +187,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname )
CloseAllDialogs()
uiGlobal.loadingLevel = levelname
+ uiGlobal.isLoading = true
StopMusic()
@@ -235,6 +236,7 @@ void function UICodeCallback_LevelLoadingFinished( bool error )
}
uiGlobal.loadingLevel = ""
+ uiGlobal.isLoading = false
Signal( uiGlobal.signalDummy, "LevelFinishedLoading" )
}
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut
index 938e0d3f..3c868aab 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut
@@ -372,8 +372,6 @@ void function StartPrivateMatch( var button )
return
ClientCommand( "StartPrivateMatchSearch" )
- NSSetLoading(true)
- NSUpdateListenServer()
}
void function DoRoomInviteIfAllowed( var button )
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 03028255..b2e2a8b6 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
@@ -1058,18 +1058,6 @@ void function ThreadedAuthAndConnectToServer( string password = "" )
}
file.cancelConnection = false
- NSSetLoading( true )
- NSUpdateServerInfo(
- NSGetServerID( file.lastSelectedServer ),
- NSGetServerName( file.lastSelectedServer ),
- password,
- NSGetServerPlayerCount( file.lastSelectedServer ),
- NSGetServerMaxPlayerCount( file.lastSelectedServer ),
- NSGetServerMap( file.lastSelectedServer ),
- Localize( GetMapDisplayName( NSGetServerMap( file.lastSelectedServer ) ) ),
- NSGetServerPlaylist( file.lastSelectedServer ),
- Localize( GetPlaylistDisplayName( NSGetServerPlaylist( file.lastSelectedServer ) ) )
- )
if ( NSWasAuthSuccessful() )
{