From d197d1f50112ee658d3112d1c980b8e4228b5357 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Fri, 27 Jan 2017 17:45:02 +0100 Subject: added some functionality to handle_chatmessage function --- packet_distribution.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'packet_distribution.cpp') diff --git a/packet_distribution.cpp b/packet_distribution.cpp index 163c744..1b25cef 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -115,7 +115,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet) QString message_line = f_contents.at(0) + ": " + f_contents.at(1); - w_courtroom->append_server_chatmessage(message_line); + if (courtroom_constructed) + w_courtroom->append_server_chatmessage(message_line); } else if (header == "PN") { @@ -262,7 +263,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet) send_server_packet(new AOPacket("AM#" + next_packet_number + "#%")); //} } - if (header == "CharsCheck") + else if (header == "CharsCheck") { for (int n_char = 0 ; n_char < f_contents.size() ; ++n_char) { @@ -272,7 +273,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_courtroom->set_taken(n_char, false); } } - if (header == "DONE") + else if (header == "DONE") { if (!courtroom_constructed) return; @@ -286,13 +287,20 @@ void AOApplication::server_packet_received(AOPacket *p_packet) destruct_lobby(); } //server accepting char request(CC) packet - if (header == "PV") + else if (header == "PV") { if (f_contents.size() < 3) return; w_courtroom->enter_courtroom(f_contents.at(2).toInt()); } + else if (header == "MS") + { + if (courtroom_constructed) + w_courtroom->handle_chatmessage(&p_packet->get_contents()); + } + + delete p_packet; } void AOApplication::send_ms_packet(AOPacket *p_packet) -- cgit From b23e96728b3c8080d454100fb7db53ab46666e4e Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sat, 28 Jan 2017 12:43:20 +0100 Subject: added server name in window title --- packet_distribution.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'packet_distribution.cpp') diff --git a/packet_distribution.cpp b/packet_distribution.cpp index 1b25cef..e39978d 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -138,9 +138,16 @@ void AOApplication::server_packet_received(AOPacket *p_packet) loaded_music = 0; destruct_courtroom(); - construct_courtroom(); + QString window_title = "Attorney Online 2"; + int selected_server = w_lobby->get_selected_server(); + + if (selected_server >= 0 && selected_server < server_list.size()) + window_title += ": " + server_list.at(selected_server).name; + + w_courtroom->set_window_title(window_title); + w_lobby->show_loading_overlay(); w_lobby->set_loading_text("Loading"); -- cgit From 63108a7adcbdc1d287cb5f92bbf01d660f1cab0c Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sat, 28 Jan 2017 13:01:44 +0100 Subject: fixed an issue where ao2 could not connect to demonserver --- packet_distribution.cpp | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) (limited to 'packet_distribution.cpp') diff --git a/packet_distribution.cpp b/packet_distribution.cpp index e39978d..ac42747 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -185,19 +185,9 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_courtroom->append_char(f_char); } - if (loaded_chars < char_list_size) - { - QString next_packet_number = QString::number(((loaded_chars - 1) / 10) + 1); - send_server_packet(new AOPacket("AN#" + next_packet_number + "#%")); - } + QString next_packet_number = QString::number(((loaded_chars - 1) / 10) + 1); + send_server_packet(new AOPacket("AN#" + next_packet_number + "#%")); - else - { - if (evidence_list_size == 0) - send_server_packet(new AOPacket("AM#0#%")); - else - send_server_packet(new AOPacket("AE#0#%")); - } } else if (header == "EI"){ if (!courtroom_constructed) @@ -228,16 +218,9 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_courtroom->append_evidence(f_evi); - if (loaded_evidence < evidence_list_size) - { - qDebug() << "loaded evidence: " << loaded_evidence; - QString next_packet_number = QString::number(loaded_evidence); - send_server_packet(new AOPacket("AE#" + next_packet_number + "#%")); - } - else - { - send_server_packet(new AOPacket("AM#0#%")); - } + QString next_packet_number = QString::number(loaded_evidence); + send_server_packet(new AOPacket("AE#" + next_packet_number + "#%")); + } else if (header == "EM") { @@ -261,14 +244,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_courtroom->append_music(f_music); } - //apparently we need to intentionally send another AM packet to get onwards in the loading process - //in spite of the fact that we actually received all the music - //enjoy fanta - //if (loaded_music < music_list_size) - //{ - QString next_packet_number = QString::number(((loaded_music - 1) / 10) + 1); - send_server_packet(new AOPacket("AM#" + next_packet_number + "#%")); - //} + QString next_packet_number = QString::number(((loaded_music - 1) / 10) + 1); + send_server_packet(new AOPacket("AM#" + next_packet_number + "#%")); } else if (header == "CharsCheck") { -- cgit From ab321a4a7af042eed2b9cb7c82fe8345a9d7b594 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sat, 28 Jan 2017 14:47:23 +0100 Subject: misc --- packet_distribution.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'packet_distribution.cpp') diff --git a/packet_distribution.cpp b/packet_distribution.cpp index ac42747..6d24278 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -143,8 +143,17 @@ void AOApplication::server_packet_received(AOPacket *p_packet) QString window_title = "Attorney Online 2"; int selected_server = w_lobby->get_selected_server(); - if (selected_server >= 0 && selected_server < server_list.size()) - window_title += ": " + server_list.at(selected_server).name; + + if (w_lobby->public_servers_selected) + { + if (selected_server >= 0 && selected_server < server_list.size()) + window_title += ": " + server_list.at(selected_server).name; + } + else + { + if (selected_server >= 0 && selected_server < favorite_list.size()) + window_title += ": " + favorite_list.at(selected_server).name; + } w_courtroom->set_window_title(window_title); -- cgit