From 1fe290aa74fb7ebfedfcec7aa1c7d6bd7fe32a91 Mon Sep 17 00:00:00 2001 From: OmniTroid Date: Sat, 8 Jul 2017 19:57:43 +0200 Subject: [PATCH] ready for the REAL real (really real this time) 2.4.3 release --- packet_distribution.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packet_distribution.cpp b/packet_distribution.cpp index 9915b3e..4d74654 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -140,9 +140,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet) //you may ask where 322 comes from. that would be a good question. s_decryptor = fanta_decrypt(f_contents.at(0), 322).toUInt(); - QString f_hdid; - f_hdid = get_hdid(); - //default(legacy) values encryption_needed = true; yellow_text_enabled = false; @@ -153,6 +150,13 @@ void AOApplication::server_packet_received(AOPacket *p_packet) desk_mod_enabled = false; evidence_enabled = false; + //workaround for tsuserver4 + if (f_contents.at(0) == "NOENCRYPT") + encryption_needed = false; + + QString f_hdid; + f_hdid = get_hdid(); + AOPacket *hi_packet = new AOPacket("HI#" + f_hdid + "#%"); send_server_packet(hi_packet); } @@ -164,12 +168,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet) s_pv = f_contents.at(0).toInt(); server_software = f_contents.at(1); - QString server_software = f_contents.at(1); - - //temporary workaround - if (server_software == "tsuserver3") - server_packet_received(new AOPacket("FL#yellowtext#customobjections#flipping#fastloading#noencryption#%")); - send_server_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%")); } else if (header == "CT")