Make the delimiter a hardcoded toggle rather than a customisable setting

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index fec6d9a46d6c66d179c9ce64c42d2081d9881fb6..6aa798afb9b8b823f6363a914cde396fb165d55f 100644 (file)
--- 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 fb0ef23538fb0a804534b335b2612d0f894b53b1..6e2bbb8d7cd3c8a52868f9d3456c6b17d789db04 100644 (file)
--- 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 63cff8f53c5e837a5df2795ca4498dbd8721f4ee..87ab27076a7fd4890686383f52029a0986e09edd 100644 (file)
--- 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"