diff options
| author | David Skoland <davidskoland@gmail.com> | 2017-01-27 01:17:33 +0100 |
|---|---|---|
| committer | David Skoland <davidskoland@gmail.com> | 2017-01-27 01:17:33 +0100 |
| commit | 9682087667e2de26e14406efde960b8c7f0c3c98 (patch) | |
| tree | a2b2dbee3b1a3102499b3cb5c6529e6f01655f74 /packet_distribution.cpp | |
| parent | 5e2ea2b24c2c0151ff8b0354632aa00148e0e6d6 (diff) | |
implemented ooc chat and cleaned up some old headers
Diffstat (limited to 'packet_distribution.cpp')
| -rw-r--r-- | packet_distribution.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/packet_distribution.cpp b/packet_distribution.cpp index d53b5a6a..163c744d 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -63,8 +63,7 @@ void AOApplication::ms_packet_received(AOPacket *p_packet) } if (courtroom_constructed) { - //T0D0: uncomment this when it's implemented - //w_courtroom->append_ms_chat_message(message_line); + w_courtroom->append_ms_chatmessage(message_line); } } } @@ -77,7 +76,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet) QStringList f_contents = p_packet->get_contents(); QString f_packet = p_packet->to_string(); - qDebug() << "R: " << f_packet; + if (header != "checkconnection") + qDebug() << "R: " << f_packet; if (header == "decryptor") { @@ -113,10 +113,9 @@ void AOApplication::server_packet_received(AOPacket *p_packet) return; } - //QString message_line = f_contents.at(0) + ": " + f_contents.at(1); + QString message_line = f_contents.at(0) + ": " + f_contents.at(1); - //T0D0, uncomment when implemented - //w_courtroom->append_ooc_chatmessage(message_line) + w_courtroom->append_server_chatmessage(message_line); } else if (header == "PN") { @@ -176,7 +175,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_lobby->set_loading_text("Loading chars:\n" + QString::number(loaded_chars) + "/" + QString::number(char_list_size)); w_courtroom->append_char(f_char); - //qDebug() << "appended " << f_char.name << " to char_list"; } if (loaded_chars < char_list_size) @@ -281,10 +279,20 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_courtroom->set_char_select_page(); + w_courtroom->append_ms_chatmessage(w_lobby->get_chatlog()); + w_courtroom->show(); destruct_lobby(); } + //server accepting char request(CC) packet + if (header == "PV") + { + if (f_contents.size() < 3) + return; + + w_courtroom->enter_courtroom(f_contents.at(2).toInt()); + } } void AOApplication::send_ms_packet(AOPacket *p_packet) |