Commit: 66b94bcd9b8021e0b12f2c9ef90743aa69f1201c - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revision: 66b94bcd9b8021e0b12f2c9ef90743aa69f1201c (tree)
• Time: 2022-08-22 12:29:43
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added an option to filter the server list by name within the built-in server browser menu.

Change Summary

• modified: src/menu/browsermenu.cpp
• modified: wadsrc/static/menudef.za

Incremental Difference

diff -r 78ebfcf4e52d -r 66b94bcd9b80 src/menu/browsermenu.cpp
--- a/src/menu/browsermenu.cpp	Sun Aug 28 15:49:46 2022 +0200
+++ b/src/menu/browsermenu.cpp	Sun Aug 21 23:29:43 2022 -0400
@@ -105,6 +105,10 @@
 {
 	M_BuildServerList();
 }
+CUSTOM_CVAR( String, menu_browser_filtername, "", CVAR_ARCHIVE ) // [AK]
+{
+	M_BuildServerList();
+}
 
 // =================================================================================================
 //
@@ -479,6 +483,24 @@
 			return ( false );
 	}
 
+	// [AK] Only show servers containing words that we want to filter in.
+	if ( strlen( menu_browser_filtername ) > 0 )
+	{
+		FString hostName = BROWSER_GetHostName( lServer );
+		FString filterName = menu_browser_filtername.GetGenericRep( CVAR_String ).String;
+
+		// [AK] A filter string that's longer than the server's name obviously means that it can't be shown.
+		if ( filterName.Len( ) > hostName.Len( ))
+			return ( false );
+
+		// [AK] Set both strings to lowercase first.
+		hostName.ToLower( );
+		filterName.ToLower( );
+
+		if ( strstr( hostName, filterName ) == NULL )
+			return ( false );
+	}
+
 	return ( true );
 }
 
@@ -588,6 +610,13 @@
 }
 
 //*****************************************************************************
+// [AK]
+CCMD ( menu_clear_browser_filter )
+{
+	menu_browser_filtername = "";
+}
+
+//*****************************************************************************
 //
 CCMD ( menu_join_selected_server )
 {

diff -r 78ebfcf4e52d -r 66b94bcd9b80 wadsrc/static/menudef.za
--- a/wadsrc/static/menudef.za	Sun Aug 28 15:49:46 2022 +0200
+++ b/wadsrc/static/menudef.za	Sun Aug 21 23:29:43 2022 -0400
@@ -244,6 +244,7 @@
 	Option		"Sort by",		"menu_browser_sortby",		"ZA_ServerSortType"
 	Option		"Show empty",		"menu_browser_showempty",		"YesNo"
 	Option		"Show full",		"menu_browser_showfull",		"YesNo"
+	TextField	"Filter name",		"menu_browser_filtername"
 	StaticText	" "
 	StaticText	" " // Header
 	StaticText	" "
@@ -257,6 +258,7 @@
 	ServerBrowserSlot 7
 	StaticText	" "
 	Command		"Refresh",			"querymaster"
+	Command		"Clear filter",			"menu_clear_browser_filter"
 	Submenu		"Get server info",			"ZA_ServerInfo"
 	SafeCommand	"Join game!",			"menu_join_selected_server"
 }