X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_join_serverinfo.c;h=5f6262cf45e5bdb508f69dd32f7117cd4b9c673e;hb=a8b77d9bb65c2f94eb9bb3395866a47226449c08;hp=12bca0e3c2d2c736b5b48f6e3bf89227af0c19b0;hpb=b1d62afcd834544c33881566ab70ac11b1725b61;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
index 12bca0e3c..5f6262cf4 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
@@ -21,7 +21,6 @@ CLASS(XonoticServerInfoDialog) EXTENDS(XonoticDialog)
 	ATTRIB(XonoticServerInfoDialog, currentServerKey, string, string_null)
 	ATTRIB(XonoticServerInfoDialog, currentServerID, string, string_null)
 	ATTRIB(XonoticServerInfoDialog, currentServerEncrypt, string, string_null)
-	ATTRIB(XonoticServerInfoDialog, currentServerCanConnect, string, string_null)
 	ATTRIB(XonoticServerInfoDialog, currentServerPure, string, string_null)
 
 	ATTRIB(XonoticServerInfoDialog, nameLabel, entity, NULL)
@@ -96,12 +95,10 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 	if(me.currentServerID)
 		strunzone(me.currentServerID);
 	me.currentServerID = string_null;
-	if(me.currentServerEncrypt)
-		strunzone(me.currentServerEncrypt);
-	me.currentServerEncrypt = string_null;
-	if(me.currentServerCanConnect)
-		strunzone(me.currentServerCanConnect);
-	me.currentServerCanConnect = string_null;
+	// not zoned!
+	//if(me.currentServerEncrypt)
+	//	strunzone(me.currentServerEncrypt);
+	//me.currentServerEncrypt = string_null;
 	if(me.currentServerPure)
 		strunzone(me.currentServerPure);
 	me.currentServerPure = string_null;
@@ -175,8 +172,6 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 	me.currentServerPing = strzone(s);
 	me.pingLabel.setText(me.pingLabel, me.currentServerPing);
 
-	print(me.currentServerCName, "\n");
-
 	s = crypto_getidfp(me.currentServerCName);
 	if not(s)
 		s = "N/A";
@@ -203,19 +198,25 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 			if(cvar("crypto_aeslevel") >= 3)
 				me.currentServerEncrypt = "not supported (can't connect)";
 			else
-				me.currentServerEncrypt = "not supported";
+				me.currentServerEncrypt = "not supported (won't encrypt)";
 			break;
 		case 1:
-			me.currentServerEncrypt = "supported";
+			if(cvar("crypto_aeslevel") >= 2)
+				me.currentServerEncrypt = "supported (will encrypt)";
+			else
+				me.currentServerEncrypt = "supported (won't encrypt)";
 			break;
 		case 2:
-			me.currentServerEncrypt = "requested";
+			if(cvar("crypto_aeslevel") >= 1)
+				me.currentServerEncrypt = "requested (will encrypt)";
+			else
+				me.currentServerEncrypt = "requested (won't encrypt)";
 			break;
 		case 3:
 			if(cvar("crypto_aeslevel") <= 0)
 				me.currentServerEncrypt = "required (can't connect)";
 			else
-				me.currentServerEncrypt = "required";
+				me.currentServerEncrypt = "required (will encrypt)";
 			break;
 	}
 	me.encryptLabel.setText(me.encryptLabel, me.currentServerEncrypt);