Made servers modified via cvar changes appear in normal servers

diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc
index 47cc367918059afb95c6d7bdaa7597db4a35c861..03bcd438b4edbf76b07c8b3e991f861e83f8b260 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qc
+++ b/qcsrc/menu/xonotic/serverlist.qc
@@ -211,7 +211,8 @@ int CategoryForEntry(int entry)
        }
 
        // must be normal or impure server
-       return ((impure > autocvar_menu_slist_purethreshold) ? CAT_MODIFIED : CAT_NORMAL);
+       //return ((impure > autocvar_menu_slist_purethreshold) ? CAT_MODIFIED : CAT_NORMAL);
+       return CAT_NORMAL; // don't separate normal and modified server categories
 }
 
 METHOD(XonoticServerList, toggleFavorite, void(XonoticServerList this, string srv))

diff --git a/qcsrc/menu/xonotic/serverlist.qh b/qcsrc/menu/xonotic/serverlist.qh
index 019e11abe42164bfc809958ddd30f9c54da5f768..035a39506fca4e66e10c3fba9691d7694555b39d 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qh
+++ b/qcsrc/menu/xonotic/serverlist.qh
@@ -108,7 +108,6 @@ SLIST_FIELDS
 
 float autocvar_menu_slist_categories;
 float autocvar_menu_slist_categories_onlyifmultiple;
-float autocvar_menu_slist_purethreshold;
 float autocvar_menu_slist_modimpurity;
 float autocvar_menu_slist_maxping = 300;
 float autocvar_menu_slist_recommendations;

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 3a8f27e2880fcf2b9e9e183c45f90ca3d223ef36..4f36583a7ea617ebf8a84e23c4a9eab844c7ab41 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -577,7 +577,6 @@ seta menu_slist_modfilter "" // set to either: !modname or modname. modname of =
 // other serverlist cvars
 seta menu_slist_categories 0
 seta menu_slist_categories_onlyifmultiple 1
-seta menu_slist_purethreshold 0
 seta menu_slist_maxping 300
 seta menu_slist_modimpurity 0
 seta menu_slist_recommendations 3