X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fipban.qc;h=6211362ac67f815d25c153880dac6f43eb07b6fd;hb=b283d314c0c619a12b54c6094ade99ed69daed67;hp=ec845454a951714885dbf5768bc6e6a4703f02c3;hpb=daab9330abb8952053b47239d1322cd029b08cd1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index ec845454a..6211362ac 100644
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,5 +1,7 @@
 #include "ipban.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #include "autocvars.qh"
 #include "command/banning.qh"
 #include "defs.qh"
@@ -163,7 +165,7 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data)
 
 		LOG_TRACE("received ban list item ", ftos(i / 4), ": ip=", ip);
 		LOG_TRACE(" timeleft=", ftos(timeleft), " reason=", reason);
-		LOG_TRACE(" serverip=", serverip, "\n");
+		LOG_TRACE(" serverip=", serverip);
 
 		timeleft -= 1.5 * autocvar_g_ban_sync_timeout;
 		if(timeleft < 0)
@@ -196,8 +198,8 @@ LABEL(skip)
 	}
 }
 
-void OnlineBanList_Think()
-{SELFPARAM();
+void OnlineBanList_Think(entity this)
+{
 	float argc;
 	string uri;
 	float i, n;
@@ -237,13 +239,13 @@ void OnlineBanList_Think()
 	}
 
 	if(autocvar_g_ban_sync_interval > 0)
-		self.nextthink = time + max(60, autocvar_g_ban_sync_interval * 60);
+		this.nextthink = time + max(60, autocvar_g_ban_sync_interval * 60);
 	else
 		goto killme;
 	return;
 
 LABEL(killme)
-	remove(self);
+	delete(this);
 }
 
 const float BAN_MAX = 256;
@@ -507,10 +509,10 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 			if(time + bantime > ban_expire[i])
 			{
 				ban_expire[i] = time + bantime;
-				LOG_TRACE(ip, "'s ban has been prolonged to ", ftos(bantime), " seconds from now\n");
+				LOG_TRACE(ip, "'s ban has been prolonged to ", ftos(bantime), " seconds from now");
 			}
 			else
-				LOG_TRACE(ip, "'s ban is still active until ", ftos(ban_expire[i] - time), " seconds from now\n");
+				LOG_TRACE(ip, "'s ban is still active until ", ftos(ban_expire[i] - time), " seconds from now");
 
 			// and enforce
 			reason = Ban_Enforce(i, reason);
@@ -552,7 +554,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 	}
 	// okay, insert our new victim as i
 	Ban_Delete(i);
-	LOG_TRACE(ip, " has been banned for ", ftos(bantime), " seconds\n");
+	LOG_TRACE(ip, " has been banned for ", ftos(bantime), " seconds");
 	ban_expire[i] = time + bantime;
 	ban_ip[i] = strzone(ip);
 	ban_count = max(ban_count, i + 1);