X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_join_serverinfo.qc;h=5745ce072e044940ddadd3d2e19dd41875e65dbb;hb=25f7a4a5f137ffb344c47107636fcfc7cdfa2045;hp=2f37eb7e2b665c260d6e5174797eaaec3d58cda4;hpb=3bbd344ce0194f454a4bde49ebfce3cb48c06279;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
index 2f37eb7e2..5745ce072 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
@@ -16,61 +16,21 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 	// ====================================
 	//  First clear and unzone the strings
 	// ====================================
-	if(me.currentServerName)
-		strunzone(me.currentServerName);
-	me.currentServerName = string_null;
-
-	if(me.currentServerCName)
-		strunzone(me.currentServerCName);
-	me.currentServerCName = string_null;
-
-	if(me.currentServerType)
-		strunzone(me.currentServerType);
-	me.currentServerType = string_null;
-
-	if(me.currentServerMap)
-		strunzone(me.currentServerMap);
-	me.currentServerMap = string_null;
-
-	if(me.currentServerPlayers)
-		strunzone(me.currentServerPlayers);
-	me.currentServerPlayers = string_null;
-
-	if(me.currentServerNumPlayers)
-		strunzone(me.currentServerNumPlayers);
-	me.currentServerNumPlayers = string_null;
-
-	if(me.currentServerNumBots)
-		strunzone(me.currentServerNumBots);
-	me.currentServerNumBots = string_null;
-
-	if(me.currentServerNumFreeSlots)
-		strunzone(me.currentServerNumFreeSlots);
-	me.currentServerNumFreeSlots = string_null;
-
-	if(me.currentServerMod)
-		strunzone(me.currentServerMod);
-	me.currentServerMod = string_null;
-
-	if(me.currentServerVersion)
-		strunzone(me.currentServerVersion);
-	me.currentServerVersion = string_null;
-
+	strfree(me.currentServerName);
+	strfree(me.currentServerCName);
+	strfree(me.currentServerType);
+	strfree(me.currentServerMap);
+	strfree(me.currentServerPlayers);
+	strfree(me.currentServerNumPlayers);
+	strfree(me.currentServerNumBots);
+	strfree(me.currentServerNumFreeSlots);
+	strfree(me.currentServerMod);
+	strfree(me.currentServerVersion);
 	// not zoned!
-	//if(me.currentServerEncrypt)
-	//	strunzone(me.currentServerEncrypt);
-	//me.currentServerEncrypt = string_null;
-	if(me.currentServerPure)
-		strunzone(me.currentServerPure);
-	me.currentServerPure = string_null;
-
-	if(me.currentServerKey)
-		strunzone(me.currentServerKey);
-	me.currentServerKey = string_null;
-
-	if(me.currentServerID)
-		strunzone(me.currentServerID);
-	me.currentServerID = string_null;
+	//	strfree(me.currentServerEncrypt);
+	strfree(me.currentServerPure);
+	strfree(me.currentServerKey);
+	strfree(me.currentServerID);
 
 	// ==========================
 	//  Now, fill in the strings
@@ -198,6 +158,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 			break;
 	}
 	me.encryptLabel.setText(me.encryptLabel, me.currentServerEncrypt);
+	setZonedTooltip(me.encryptLabel, _("Use the `crypto_aeslevel` cvar to change your preferences"), string_null);
 
 	s = crypto_getidfp(me.currentServerCName);
 	if (!s) { s = _("N/A"); }