Merge pull request #37 from F1F7Y/main

Fix minor bugs in server browser

3 files changed, 56 insertions, 10 deletions

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
index b37afef3..49ec746c 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
diff --git a/Northstar.Client/mod/resource/ui/menus/server_browser.menu b/Northstar.Client/mod/resource/ui/menus/server_browser.menu
index feca06fb..959c1b09 100644
--- a/Northstar.Client/mod/resource/ui/menus/server_browser.menu
+++ b/Northstar.Client/mod/resource/ui/menus/server_browser.menu
@@ -173,9 +173,12 @@ resource/ui/menus/mods_browse.menu
 
 		// PasswordProtected
 
-		// BtnServerPasswordProtected (lock icons) dont pin to specified siblings
+		// BtnServerPasswordProtectedx (lock icons) dont pin to specified siblings
 		// Their 0,0 is the screen 0,0
-		// Too lazy to fix hopefully doesn't break on other resolutions
+		// I have no idea why, current ypos values hold up pretty well, but some users may still notice the missalignment
+		// Tried evrything, if I find a difeerent way to do this will try
+		// - Fifty#8113
+
 		BtnServerPasswordProtectedTab
 		{
 			ControlName				ImagePanel
@@ -184,7 +187,7 @@ resource/ui/menus/mods_browse.menu
 			wide 					48
 			tall					48
 
-			pin_to_sibling				RowButtonsAnchor
+			pin_to_sibling					RowButtonsAnchor
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_LEFT
 		}
@@ -193,16 +196,18 @@ resource/ui/menus/mods_browse.menu
 		{
 			ControlName				ImagePanel
 			classname 				ServerLock
-			image							"ui/menu/common/locked_icon"
+			image					"ui/menu/common/locked_icon"
 			scaleImage				1
 			wide 					48
-			tall 					48
-			xpos 94
-			ypos 200
+			tall					48
+			xpos					94
+			ypos					200
 
-			pin_to_sibling			BtnServer1
+			pin_to_sibling					FilterPanel
 			pin_corner_to_sibling	TOP_LEFT
 			pin_to_sibling_corner	BOTTOM_LEFT
+
+
 		}
 		BtnServerPasswordProtected2
 		{
@@ -348,7 +353,7 @@ resource/ui/menus/mods_browse.menu
 			wide 					48
 			tall 					48
 			xpos 94
-			ypos 399
+			ypos 599
 
 			pin_to_sibling			BtnServer11
 			pin_corner_to_sibling	TOP_LEFT
@@ -2566,7 +2571,6 @@ resource/ui/menus/mods_browse.menu
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		BOTTOM_LEFT
 		}
-
 		InGamePlayerCount
 		{
 			ControlName		Label
@@ -2585,6 +2589,43 @@ resource/ui/menus/mods_browse.menu
 			pin_to_sibling_corner		TOP_RIGHT
 		}
 
+		TotalServerLabel
+		{
+			ControlName		Label
+			auto_wide_tocontents 	1
+			tall 					40
+			labelText			"#TOTAL_SERVERS"
+			xpos						46
+			visible					1
+			zpos						101
+
+			font								Default_28_ShadowGlow
+			bgcolor_override		"0 0 0 120"
+			fgcolor_override		"255 255 255 175"
+			visible					1
+
+			pin_to_sibling					InGamePlayerCount
+			pin_corner_to_sibling		TOP_LEFT
+			pin_to_sibling_corner		TOP_RIGHT
+		}
+		TotalServerCount
+		{
+			ControlName		Label
+			auto_wide_tocontents 	1
+			tall 					40
+			labelText			""
+			font								Default_28_ShadowGlow
+			bgcolor_override		"0 0 0 120"
+			fgcolor_override		"196 108 108 200"
+			xpos						6
+			visible					1
+			zpos						101
+
+			pin_to_sibling					TotalServerLabel
+			pin_corner_to_sibling		TOP_LEFT
+			pin_to_sibling_corner		TOP_RIGHT
+		}
+
 
 		FooterButtons
 		{
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 6dcdabd8..a989da12 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
@@ -701,6 +701,7 @@ void function FilterServerList()
 	printt("---------------------------------------------")
 
 	Hud_SetText( Hud_GetChild( file.menu, "InGamePlayerCount" ), string( totalPlayers ) )
+	Hud_SetText( Hud_GetChild( file.menu, "TotalServerCount" ), string( NSGetServerCount() ) )
 }
 
 void function CheckGamemode( serverStruct t )
@@ -776,6 +777,9 @@ void function OnServerButtonClicked(var button)
 
 void function CheckDoubleClick(int scriptID, bool wasClickNav)
 {
+	if ( NSGetServerCount() == 0 ) return
+
+
 	file.focusedServerIndex = file.serversArrayFiltered[ file.scrollOffset + scriptID ].serverIndex
 	int serverIndex = file.scrollOffset + scriptID
 
@@ -807,6 +811,7 @@ void function DisplayFocusedServerInfo( int scriptID)
 	var menu = GetMenu( "ServerBrowserMenu" )
 
 	int serverIndex = file.scrollOffset + scriptID
+	if (serverIndex < 0) serverIndex = 0
 
 
 	Hud_SetVisible( Hud_GetChild( menu, "BtnServerDescription" ), true )