X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fserverlist.c;h=f02d747cc91f1f0e229c56074c217dc2609e2c5e;hb=656ec3265b2e70732d9104fd87f339fccf7d0e90;hp=6e9bf1790751764bd48bf9007c5e519106fa08ee;hpb=94a82b02881255012b915709186b14c9caea330e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index 6e9bf1790..f02d747cc 100644
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -238,7 +238,7 @@ void XonoticServerList_refreshServerList(entity me, float mode)
 	}
 	else */
 	{
-		float m, o;
+		float m, o, i, n; // moin moin
 		string s, typestr, modstr;
 		s = me.filterString;
 
@@ -261,15 +261,22 @@ void XonoticServerList_refreshServerList(entity me, float mode)
 		// ping: reject negative ping (no idea why this happens in the first place, engine bug)
 		sethostcachemasknumber(++m, SLIST_FIELD_PING, 0, SLIST_TEST_GREATEREQUAL);
 
+		// show full button
 		if(!me.filterShowFull)
 		{
 			sethostcachemasknumber(++m, SLIST_FIELD_FREESLOTS, 1, SLIST_TEST_GREATEREQUAL); // legacy
 			sethostcachemaskstring(++m, SLIST_FIELD_QCSTATUS, ":S0:", SLIST_TEST_NOTCONTAIN); // g_maxplayers support
 		}
+
+		// show empty button
 		if(!me.filterShowEmpty)
 			sethostcachemasknumber(++m, SLIST_FIELD_NUMHUMANS, 1, SLIST_TEST_GREATEREQUAL);
+
+		// gametype filtering
 		if(typestr != "")
 			sethostcachemaskstring(++m, SLIST_FIELD_QCSTATUS, strcat(typestr, ":"), SLIST_TEST_STARTSWITH);
+
+		// mod filtering
 		if(modstr != "")
 		{
 			if(substring(modstr, 0, 1) == "!")
@@ -277,6 +284,13 @@ void XonoticServerList_refreshServerList(entity me, float mode)
 			else
 				sethostcachemaskstring(++m, SLIST_FIELD_MOD, resolvemod(modstr), SLIST_TEST_EQUAL);
 		}
+
+		// server banning
+		n = tokenizebyseparator(_Nex_ExtResponseSystem_BannedServers, " ");
+		for(i = 0; i < n; ++i)
+			if(argv(i) != "")
+				sethostcachemaskstring(++m, SLIST_FIELD_CNAME, argv(i), SLIST_TEST_NOTSTARTSWITH);
+
 		m = SLIST_MASK_OR - 1;
 		if(s != "")
 		{
@@ -308,6 +322,13 @@ void XonoticServerList_draw(entity me)
 {
 	float i, found, owned;
 
+	if(_Nex_ExtResponseSystem_BannedServersNeedsRefresh)
+	{
+		if(!me.needsRefresh)
+			me.needsRefresh = 2;
+		_Nex_ExtResponseSystem_BannedServersNeedsRefresh = 0;
+	}
+
 	if(me.currentSortField == -1)
 	{
 		me.setSortOrder(me, SLIST_FIELD_PING, +1);
@@ -469,17 +490,17 @@ void ServerList_ShowFull_Click(entity box, entity me)
 	me.ipAddressBox.cursorPos = 0;
 	me.ipAddressBoxFocused = -1;
 }
-void XonoticServerList_setSortOrder(entity me, float field, float direction)
+void XonoticServerList_setSortOrder(entity me, float fld, float direction)
 {
-	if(me.currentSortField == field)
+	if(me.currentSortField == fld)
 		direction = -me.currentSortOrder;
 	me.currentSortOrder = direction;
-	me.currentSortField = field;
-	me.sortButton1.forcePressed = (field == SLIST_FIELD_PING);
-	me.sortButton2.forcePressed = (field == SLIST_FIELD_NAME);
-	me.sortButton3.forcePressed = (field == SLIST_FIELD_MAP);
+	me.currentSortField = fld;
+	me.sortButton1.forcePressed = (fld == SLIST_FIELD_PING);
+	me.sortButton2.forcePressed = (fld == SLIST_FIELD_NAME);
+	me.sortButton3.forcePressed = (fld == SLIST_FIELD_MAP);
 	me.sortButton4.forcePressed = 0;
-	me.sortButton5.forcePressed = (field == SLIST_FIELD_NUMHUMANS);
+	me.sortButton5.forcePressed = (fld == SLIST_FIELD_NUMHUMANS);
 	me.selectedItem = 0;
 	if(me.selectedServer)
 		strunzone(me.selectedServer);