Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h
#	src/courtroom.cpp

1 files changed, 19 insertions, 177 deletions

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 17e57bf7..0bc38141 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -2,7 +2,6 @@
 
 #include "courtroom.h"
 #include "debug_functions.h"
-#include "encryption_functions.h"
 #include "hardware_functions.h"
 #include "lobby.h"
 #include "networkmanager.h"
@@ -120,16 +119,11 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (f_contents.size() == 0)
       goto end;
 
-    // you may ask where 322 comes from. that would be a good question.
-    s_decryptor = fanta_decrypt(f_contents.at(0), 322).toUInt();
-
     // default(legacy) values
-    encryption_needed = true;
     yellow_text_enabled = false;
     prezoom_enabled = false;
     flipping_enabled = false;
     custom_objection_enabled = false;
-    improved_loading_enabled = false;
     desk_mod_enabled = false;
     evidence_enabled = false;
     cccc_ic_support_enabled = false;
@@ -139,10 +133,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     looping_sfx_support_enabled = false;
     additive_enabled = false;
     effects_enabled = false;
-
-    // workaround for tsuserver4
-    if (f_contents.at(0) == "NOENCRYPT")
-      encryption_needed = false;
+    y_offset_enabled = false;
 
     QString f_hdid;
     f_hdid = get_hdid();
@@ -176,12 +167,10 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     }
   }
   else if (header == "FL") {
-    //    encryption_needed = true;
     yellow_text_enabled = false;
     prezoom_enabled = false;
     flipping_enabled = false;
     custom_objection_enabled = false;
-    improved_loading_enabled = false;
     desk_mod_enabled = false;
     evidence_enabled = false;
     cccc_ic_support_enabled = false;
@@ -191,6 +180,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     looping_sfx_support_enabled = false;
     additive_enabled = false;
     effects_enabled = false;
+    expanded_desk_mods_enabled = false;
     if (f_packet.contains("yellowtext", Qt::CaseInsensitive))
       yellow_text_enabled = true;
     if (f_packet.contains("prezoom", Qt::CaseInsensitive))
@@ -199,10 +189,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       flipping_enabled = true;
     if (f_packet.contains("customobjections", Qt::CaseInsensitive))
       custom_objection_enabled = true;
-    if (f_packet.contains("fastloading", Qt::CaseInsensitive))
-      improved_loading_enabled = true;
-    if (f_packet.contains("noencryption", Qt::CaseInsensitive))
-      encryption_needed = false;
     if (f_packet.contains("deskmod", Qt::CaseInsensitive))
       desk_mod_enabled = true;
     if (f_packet.contains("evidence", Qt::CaseInsensitive))
@@ -221,6 +207,10 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       additive_enabled = true;
     if (f_packet.contains("effects", Qt::CaseInsensitive))
       effects_enabled = true;
+    if (f_packet.contains("y_offset", Qt::CaseInsensitive))
+        y_offset_enabled = true;
+    if (f_packet.contains("expanded_desk_mods", Qt::CaseInsensitive))
+      expanded_desk_mods_enabled = true;
   }
   else if (header == "PN") {
     if (f_contents.size() < 2)
@@ -228,6 +218,11 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     w_lobby->set_player_count(f_contents.at(0).toInt(),
                               f_contents.at(1).toInt());
+
+    if (w_lobby->doubleclicked) {
+        send_server_packet(new AOPacket("askchaa#%"));
+        w_lobby->doubleclicked = false;
+    }
   }
   else if (header == "SI") {
     if (f_contents.size() != 3)
@@ -283,11 +278,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     AOPacket *f_packet;
 
-    if (improved_loading_enabled)
-      f_packet = new AOPacket("RC#%");
-    else
-      f_packet = new AOPacket("askchar2#%");
-
+    f_packet = new AOPacket("RC#%");
     send_server_packet(f_packet);
 
     // Remove any characters not accepted in folder names for the server_name
@@ -308,152 +299,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       discord->state_server(server_name.toStdString(),
                             hash.result().toBase64().toStdString());
   }
-  else if (header == "CI") {
-    if (!courtroom_constructed)
-      goto end;
-
-    for (int n_element = 0; n_element < f_contents.size(); n_element += 2) {
-      if (f_contents.at(n_element).toInt() != loaded_chars)
-        break;
-
-      // this means we are on the last element and checking n + 1 element will
-      // be game over so
-      if (n_element == f_contents.size() - 1)
-        break;
-
-      QStringList sub_elements = f_contents.at(n_element + 1).split("&");
-      if (sub_elements.size() < 2)
-        break;
-
-      char_type f_char;
-      f_char.name = sub_elements.at(0);
-      f_char.description = sub_elements.at(1);
-      f_char.evidence_string = sub_elements.at(3);
-      // temporary. the CharsCheck packet sets this properly
-      f_char.taken = false;
-
-      ++loaded_chars;
-
-      w_lobby->set_loading_text(tr("Loading chars:\n%1/%2")
-                                    .arg(QString::number(loaded_chars))
-                                    .arg(QString::number(char_list_size)));
-
-      w_courtroom->append_char(f_char);
-
-      int total_loading_size =
-          char_list_size * 2 + evidence_list_size + music_list_size;
-      int loading_value = int(
-          ((loaded_chars + generated_chars + loaded_music + loaded_evidence) /
-           static_cast<double>(total_loading_size)) *
-          100);
-      w_lobby->set_loading_value(loading_value);
-    }
-
-    if (improved_loading_enabled)
-      send_server_packet(new AOPacket("RE#%"));
-    else {
-      QString next_packet_number =
-          QString::number(((loaded_chars - 1) / 10) + 1);
-      send_server_packet(new AOPacket("AN#" + next_packet_number + "#%"));
-    }
-  }
-  else if (header == "EI") {
-    if (!courtroom_constructed)
-      goto end;
-
-    // +1 because evidence starts at 1 rather than 0 for whatever reason
-    // enjoy fanta
-    if (f_contents.at(0).toInt() != loaded_evidence + 1)
-      goto end;
-
-    if (f_contents.size() < 2)
-      goto end;
-
-    QStringList sub_elements = f_contents.at(1).split("&");
-    if (sub_elements.size() < 4)
-      goto end;
-
-    evi_type f_evi;
-    f_evi.name = sub_elements.at(0);
-    f_evi.description = sub_elements.at(1);
-    // no idea what the number at position 2 is. probably an identifier?
-    f_evi.image = sub_elements.at(3);
-
-    ++loaded_evidence;
-
-    w_lobby->set_loading_text(tr("Loading evidence:\n%1/%2")
-                                  .arg(QString::number(loaded_evidence))
-                                  .arg(QString::number(evidence_list_size)));
-
-    w_courtroom->append_evidence(f_evi);
-
-    int total_loading_size =
-        char_list_size * 2 + evidence_list_size + music_list_size;
-    int loading_value =
-        int(((loaded_chars + generated_chars + loaded_music + loaded_evidence) /
-             static_cast<double>(total_loading_size)) *
-            100);
-    w_lobby->set_loading_value(loading_value);
-
-    QString next_packet_number = QString::number(loaded_evidence);
-    send_server_packet(new AOPacket("AE#" + next_packet_number + "#%"));
-  }
-  else if (header == "EM") {
-    if (!courtroom_constructed)
-      goto end;
-
-    bool musics_time = false;
-    int areas = 0;
-
-    for (int n_element = 0; n_element < f_contents.size(); n_element += 2) {
-      if (f_contents.at(n_element).toInt() != loaded_music)
-        break;
-
-      if (n_element == f_contents.size() - 1)
-        break;
-
-      QString f_music = f_contents.at(n_element + 1);
-
-      ++loaded_music;
-
-      w_lobby->set_loading_text(tr("Loading music:\n%1/%2")
-                                    .arg(QString::number(loaded_music))
-                                    .arg(QString::number(music_list_size)));
-
-      if (musics_time) {
-        w_courtroom->append_music(f_music);
-      }
-      else {
-        if (f_music.endsWith(".wav") || f_music.endsWith(".mp3") ||
-            f_music.endsWith(".mp4") || f_music.endsWith(".ogg") ||
-            f_music.endsWith(".opus")) {
-          musics_time = true;
-          areas--;
-          w_courtroom->fix_last_area();
-          w_courtroom->append_music(f_music);
-        }
-        else {
-          w_courtroom->append_area(f_music);
-          areas++;
-        }
-      }
-
-      for (int area_n = 0; area_n < areas; area_n++) {
-        w_courtroom->arup_append(0, "Unknown", "Unknown", "Unknown");
-      }
-
-      int total_loading_size =
-          char_list_size * 2 + evidence_list_size + music_list_size;
-      int loading_value = int(
-          ((loaded_chars + generated_chars + loaded_music + loaded_evidence) /
-           static_cast<double>(total_loading_size)) *
-          100);
-      w_lobby->set_loading_value(loading_value);
-    }
-
-    QString next_packet_number = QString::number(((loaded_music - 1) / 10) + 1);
-    send_server_packet(new AOPacket("AM#" + next_packet_number + "#%"));
-  }
   else if (header == "CharsCheck") {
     if (!courtroom_constructed)
       goto end;
@@ -621,6 +466,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (f_contents.size() < 3)
       goto end;
 
+    w_courtroom->enter_courtroom();
+
     if (courtroom_constructed)
       w_courtroom->update_character(f_contents.at(2).toInt());
   }
@@ -691,6 +538,11 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (courtroom_constructed && f_contents.size() > 0)
       w_courtroom->set_mute(false, f_contents.at(0).toInt());
   }
+  else if (header == "BB") {
+    if (courtroom_constructed && f_contents.size() >= 1) {
+      call_notice(f_contents.at(0));
+    }
+  }
   else if (header == "KK") {
     if (courtroom_constructed && f_contents.size() >= 1) {
       call_notice(tr("You have been kicked from the server.\nReason: %1")
@@ -803,19 +655,9 @@ void AOApplication::send_server_packet(AOPacket *p_packet, bool encoded)
 
   QString f_packet = p_packet->to_string();
 
-  if (encryption_needed) {
-#ifdef DEBUG_NETWORK
-    qDebug() << "S(e):" << f_packet;
-#endif
-
-    p_packet->encrypt_header(s_decryptor);
-    f_packet = p_packet->to_string();
-  }
-  else {
 #ifdef DEBUG_NETWORK
     qDebug() << "S:" << f_packet;
 #endif
-  }
 
   net_manager->ship_server_packet(f_packet);