From: terencehill <piuntn@gmail.com>
Date: Tue, 12 Apr 2022 17:11:20 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/welcome_dialog_translatable
X-Git-Tag: xonotic-v0.8.5~81^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2b0f12cb08fe3d1e59d3c9514546c4858cf9012;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/welcome_dialog_translatable
---

d2b0f12cb08fe3d1e59d3c9514546c4858cf9012
diff --cc qcsrc/client/main.qc
index 1c7013a83,0892bb6bf..5beca00be
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -1386,17 -1337,12 +1386,17 @@@ bool net_handle_ServerWelcome(
  		return true;
  	}
  
- 	bool force_centerprint = ReadByte();
- 	string hostname = ReadString();
+ 	welcome_msg_force_centerprint = ReadByte();
+ 	strcpy(hostname, ReadString());
 -	string ver = ReadString();
 -	string modifications = ReadString();
 +
 +	string hostversion = ReadString();
 +	bool version_mismatch = ReadByte();
 +	bool version_check = ReadByte();
 +	string ver = GetVersionMessage(hostversion, version_mismatch, version_check);
 +
 +	string modifications = translate_modifications(ReadString());
 +	string weaponarena_list = translate_weaponarena(ReadString());
  	string cache_mutatormsg = ReadString();
 -	string mutator_msg = ReadString();
  	string motd = ReadString();
  
  	string msg = "";