X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=39ea13604d9a3730dfe5914b639f974a1f46541d;hp=639717a901920b53c96339daebbeae95465b7511;hb=e18f904d6ae687895cd990cabe979efb0dad8c1b;hpb=55b01068a314be4ecf84072a77de52f65571f097

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 639717a901..39ea13604d 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1034,7 +1034,6 @@ string getwelcomemessage(entity this)
 
 	string versionmessage = GetClientVersionMessage(this);
 	string s = strcat(versionmessage, "^8\n^8\nmatch type is ^1", gamemode_name, "^8\n");
-	s = strcat(s, "^8\nCurrent map: ^2", GetMapname(), "^8\n");
 
 	if(modifications != "")
 		s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");
@@ -2393,11 +2392,11 @@ void PlayerPreThink (entity this)
 	if (this.netname == "" || this.netname != CS(this).netname_previous)
 	{
 		bool assume_unchanged = (CS(this).netname_previous == "");
-		if (autocvar_name_maxlength > 0 && strlennocol(this.netname) > autocvar_name_maxlength)
+		if (autocvar_sv_name_maxlength > 0 && strlennocol(this.netname) > autocvar_sv_name_maxlength)
 		{
-			int new_length = textLengthUpToLength(this.netname, autocvar_name_maxlength, strlennocol);
+			int new_length = textLengthUpToLength(this.netname, autocvar_sv_name_maxlength, strlennocol);
 			this.netname = strzone(strcat(substring(this.netname, 0, new_length), "^7"));
-			sprint(this, sprintf("Warning: your name is longer than %d characters, it has been truncated.\n", autocvar_name_maxlength));
+			sprint(this, sprintf("Warning: your name is longer than %d characters, it has been truncated.\n", autocvar_sv_name_maxlength));
 			assume_unchanged = false;
 			// stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe?
 		}