Skip to content

Commit 1fe290a

Browse files
committed
ready for the REAL real (really real this time) 2.4.3 release
1 parent a6c1e1d commit 1fe290a

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

packet_distribution.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
140140
//you may ask where 322 comes from. that would be a good question.
141141
s_decryptor = fanta_decrypt(f_contents.at(0), 322).toUInt();
142142

143-
QString f_hdid;
144-
f_hdid = get_hdid();
145-
146143
//default(legacy) values
147144
encryption_needed = true;
148145
yellow_text_enabled = false;
@@ -153,6 +150,13 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
153150
desk_mod_enabled = false;
154151
evidence_enabled = false;
155152

153+
//workaround for tsuserver4
154+
if (f_contents.at(0) == "NOENCRYPT")
155+
encryption_needed = false;
156+
157+
QString f_hdid;
158+
f_hdid = get_hdid();
159+
156160
AOPacket *hi_packet = new AOPacket("HI#" + f_hdid + "#%");
157161
send_server_packet(hi_packet);
158162
}
@@ -164,12 +168,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
164168
s_pv = f_contents.at(0).toInt();
165169
server_software = f_contents.at(1);
166170

167-
QString server_software = f_contents.at(1);
168-
169-
//temporary workaround
170-
if (server_software == "tsuserver3")
171-
server_packet_received(new AOPacket("FL#yellowtext#customobjections#flipping#fastloading#noencryption#%"));
172-
173171
send_server_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%"));
174172
}
175173
else if (header == "CT")

0 commit comments

Comments
 (0)