Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix demos incorrectly saving the packets (breaking encoding for things such as evidence by recording <and> instead of &)

Browse Source 
ACTUALLY fix encoding errors, stop supporting the absolutely bonkers <and> exceptions just to support the previous bug instead of fixing the root issue
This commit is contained in:
Crystalwarrior 2021-04-07 15:25:18 +03:00
parent c82dc8dec7
commit d5c1273518
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/packet_distribution.cpp
View File

@ -121,6 +121,7 @@ void AOApplication::append_to_demofile(QString packet_string)
void AOApplication::server_packet_received(AOPacket *p_packet) void AOApplication::server_packet_received(AOPacket *p_packet)
{ {
QStringList f_contents_encoded = p_packet->get_contents(); QStringList f_contents_encoded = p_packet->get_contents();
QString f_packet_encoded = p_packet->to_string();
p_packet->net_decode(); p_packet->net_decode();
QString header = p_packet->get_header(); QString header = p_packet->get_header();
@ -182,7 +183,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
w_courtroom->append_server_chatmessage(f_contents.at(0), w_courtroom->append_server_chatmessage(f_contents.at(0),
f_contents.at(1), "0"); f_contents.at(1), "0");
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "FL") { else if (header == "FL") {
@ -368,7 +369,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
send_server_packet(new AOPacket("RM#%")); send_server_packet(new AOPacket("RM#%"));
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
else if (header == "SM") { else if (header == "SM") {
if (!courtroom_constructed || courtroom_loaded) if (!courtroom_constructed || courtroom_loaded)
@ -471,7 +472,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
2) // We have a pos included in the background packet! 2) // We have a pos included in the background packet!
w_courtroom->set_side(f_contents.at(1)); w_courtroom->set_side(f_contents.at(1));
w_courtroom->set_background(f_contents.at(0), f_contents.size() >= 2); w_courtroom->set_background(f_contents.at(0), f_contents.size() >= 2);
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "SP") { else if (header == "SP") {
@ -481,7 +482,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
if (courtroom_constructed) // We were sent a "set position" packet if (courtroom_constructed) // We were sent a "set position" packet
{ {
w_courtroom->set_side(f_contents.at(0)); w_courtroom->set_side(f_contents.at(0));
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "SD") // Send pos dropdown else if (header == "SD") // Send pos dropdown
@ -507,14 +508,14 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
if (courtroom_constructed && courtroom_loaded) if (courtroom_constructed && courtroom_loaded)
{ {
w_courtroom->chatmessage_enqueue(p_packet->get_contents()); w_courtroom->chatmessage_enqueue(p_packet->get_contents());
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "MC") { else if (header == "MC") {
if (courtroom_constructed && courtroom_loaded) if (courtroom_constructed && courtroom_loaded)
{ {
w_courtroom->handle_song(&p_packet->get_contents()); w_courtroom->handle_song(&p_packet->get_contents());
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "RT") { else if (header == "RT") {
@ -525,7 +526,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
w_courtroom->handle_wtce(f_contents.at(0), 0); w_courtroom->handle_wtce(f_contents.at(0), 0);
else if (f_contents.size() == 2) { else if (f_contents.size() == 2) {
w_courtroom->handle_wtce(f_contents.at(0), f_contents.at(1).toInt()); w_courtroom->handle_wtce(f_contents.at(0), f_contents.at(1).toInt());
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
} }
@ -534,7 +535,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
{ {
w_courtroom->set_hp_bar(f_contents.at(0).toInt(), w_courtroom->set_hp_bar(f_contents.at(0).toInt(),
f_contents.at(1).toInt()); f_contents.at(1).toInt());
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "LE") { else if (header == "LE") {
@ -542,11 +543,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
QVector<evi_type> f_evi_list; QVector<evi_type> f_evi_list;
for (QString f_string : f_contents_encoded) { for (QString f_string : f_contents_encoded) {
QStringList sub_contents; QStringList sub_contents = f_string.split("&");
if (f_contents_encoded.contains("&"))
sub_contents = f_string.split("&");
else
sub_contents = f_string.split("<and>"); // demos incorrectly encode the separator so we have to account for that
if (sub_contents.size() < 3) if (sub_contents.size() < 3)
continue; continue;
@ -564,7 +561,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
w_courtroom->set_evidence_list(f_evi_list); w_courtroom->set_evidence_list(f_evi_list);
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
} }
else if (header == "ARUP") { else if (header == "ARUP") {
@ -669,7 +666,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
w_courtroom->set_clock_visibility(id, true); w_courtroom->set_clock_visibility(id, true);
else if (type == 3) else if (type == 3)
w_courtroom->set_clock_visibility(id, false); w_courtroom->set_clock_visibility(id, false);
append_to_demofile(p_packet->to_string(true)); append_to_demofile(f_packet_encoded);
} }
else if (header == "CHECK") { else if (header == "CHECK") {
if (!courtroom_constructed) if (!courtroom_constructed)