From: Mario <mario.mario@y7mail.com>
Date: Mon, 20 Jan 2020 23:07:06 +0000 (+1000)
Subject: Make the delimiter a hardcoded toggle rather than a customisable setting
X-Git-Tag: xonotic-v0.8.5~1161^2~1^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F765%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Make the delimiter a hardcoded toggle rather than a customisable setting
---

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index fec6d9a46..6aa798afb 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -301,7 +301,7 @@ int autocvar_sv_eventlog_files_counter;
 string autocvar_sv_eventlog_files_nameprefix;
 string autocvar_sv_eventlog_files_namesuffix;
 bool autocvar_sv_eventlog_files_timestamps;
-string autocvar_sv_eventlog_ipv6_delimiter = ":";
+bool autocvar_sv_eventlog_ipv6_delimiter = false;
 float autocvar_sv_friction_on_land;
 var float autocvar_sv_friction_slick = 0.5;
 float autocvar_sv_gameplayfix_q2airaccelerate = 1;
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index fb0ef2353..6e2bbb8d7 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -86,7 +86,9 @@ void dedicated_print(string input)
 
 string GameLog_ProcessIP(string s)
 {
-	return strreplace(":", autocvar_sv_eventlog_ipv6_delimiter, s);
+	if(!autocvar_sv_eventlog_ipv6_delimiter)
+		return s;
+	return strreplace(":", "_", s);
 }
 
 void GameLogEcho(string s)
diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 63cff8f53..87ab27076 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -314,7 +314,7 @@ set sv_eventlog_files_timestamps 1 "include timestamps in the log file names"
 set sv_eventlog_files_counter 0 "internal counter cvar, do not modify"
 set sv_eventlog_files_nameprefix xonotic "prefix of individual log file names"
 set sv_eventlog_files_namesuffix .log "suffix of individual log file names"
-set sv_eventlog_ipv6_delimiter ":" "delimiter for IPV6 IPs, customisable to allow easier processing in scripts"
+set sv_eventlog_ipv6_delimiter 0 "use a _ delimiter for IPV6 IPs, so that they can be easily detected in scripts"
 
 set nextmap "" "override the maplist when switching to the next map"
 set lastlevel "" "for singleplayer use, shows the menu once the match has ended"