1 files changed, 138 insertions, 143 deletions

diff --git a/src/charselect.cpp b/src/charselect.cpp
index d6ee044..9dee237 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -1,62 +1,57 @@
 #include "courtroom.h"
 #include "lobby.h"
 
-#include "file_functions.h"
 #include "debug_functions.h"
+#include "file_functions.h"
 #include "hardware_functions.h"
 
-class AOCharSelectGenerationThreading : public QRunnable
-{
+class AOCharSelectGenerationThreading : public QRunnable {
 public:
-    Courtroom *thisCourtroom;
-    int char_num;
-    AOCharButton *char_button;
-    AOCharSelectGenerationThreading(Courtroom *my_courtroom, int character_number, AOCharButton *charbut){
-        thisCourtroom = my_courtroom;
-        char_num = character_number;
-        char_button = charbut;
-    }
-    void run()
-    {
-        AOCharButton* thisCharacterButton = char_button;
-        thisCharacterButton->reset();
-        thisCharacterButton->hide();
-        thisCharacterButton->set_image(thisCourtroom->char_list.at(char_num).name);
-        thisCourtroom->ui_char_button_list.append(thisCharacterButton);
-
-        thisCourtroom->connect(thisCharacterButton, SIGNAL(clicked()), thisCourtroom->char_button_mapper, SLOT(map()));
-        thisCourtroom->char_button_mapper->setMapping(thisCharacterButton, thisCourtroom->ui_char_button_list.size() - 1);
-    }
+  Courtroom *thisCourtroom;
+  int char_num;
+  AOCharButton *char_button;
+  AOCharSelectGenerationThreading(Courtroom *my_courtroom, int character_number)
+  {
+    thisCourtroom = my_courtroom;
+    char_num = character_number;
+  }
+  void run()
+  {
+    // we take the button we are supposed to mess with, and not whatever comes
+    // first
+    AOCharButton *thisCharacterButton =
+        thisCourtroom->ui_char_button_list.at(char_num);
+    thisCharacterButton->reset();
+    thisCharacterButton->hide();
+    thisCharacterButton->set_image(thisCourtroom->char_list.at(char_num).name);
+
+    thisCourtroom->connect(thisCharacterButton, SIGNAL(clicked()),
+                           thisCourtroom->char_button_mapper, SLOT(map()));
+    thisCourtroom->char_button_mapper->setMapping(thisCharacterButton,
+                                                  char_num);
+  }
 };
 
-class AOCharSelectFilterThreading : public QRunnable
+void AOCharSelectFilter(Courtroom *thisCourtroom, int char_num)
 {
-public:
-    Courtroom *thisCourtroom;
-    int char_num;
-    AOCharSelectFilterThreading(Courtroom *my_courtroom, int character_number){
-        thisCourtroom = my_courtroom;
-        char_num = character_number;
-    }
-    void run()
-    {
-        AOCharButton* current_char = thisCourtroom->ui_char_button_list.at(char_num);
+  AOCharButton *current_char = thisCourtroom->ui_char_button_list.at(char_num);
 
-        if (!thisCourtroom->ui_char_taken->isChecked() && thisCourtroom->char_list.at(char_num).taken)
-            return;
+  if (!thisCourtroom->ui_char_taken->isChecked() &&
+      thisCourtroom->char_list.at(char_num).taken)
+    return;
 
-        if (!thisCourtroom->char_list.at(char_num).name.contains(thisCourtroom->ui_char_search->text(), Qt::CaseInsensitive))
-            return;
+  if (!thisCourtroom->char_list.at(char_num).name.contains(
+          thisCourtroom->ui_char_search->text(), Qt::CaseInsensitive))
+    return;
 
-        // We only really need to update the fact that a character is taken
-        // for the buttons that actually appear.
-        // You'd also update the passwordedness and etc. here later.
-        current_char->reset();
-        current_char->set_taken(thisCourtroom->char_list.at(char_num).taken);
+  // We only really need to update the fact that a character is taken
+  // for the buttons that actually appear.
+  // You'd also update the passwordedness and etc. here later.
+  current_char->reset();
+  current_char->set_taken(thisCourtroom->char_list.at(char_num).taken);
 
-        thisCourtroom->ui_char_button_list_filtered.append(current_char);
-    }
-};
+  thisCourtroom->ui_char_button_list_filtered.append(current_char);
+}
 
 void Courtroom::construct_char_select()
 {
@@ -97,28 +92,36 @@ void Courtroom::construct_char_select()
 
   set_size_and_pos(ui_char_buttons, "char_buttons");
 
-  connect(char_button_mapper, SIGNAL(mapped(int)), this, SLOT(char_clicked(int)));
-  connect(ui_back_to_lobby, SIGNAL(clicked()), this, SLOT(on_back_to_lobby_clicked()));
+  connect(char_button_mapper, SIGNAL(mapped(int)), this,
+          SLOT(char_clicked(int)));
+  connect(ui_back_to_lobby, SIGNAL(clicked()), this,
+          SLOT(on_back_to_lobby_clicked()));
 
-  connect(ui_char_select_left, SIGNAL(clicked()), this, SLOT(on_char_select_left_clicked()));
-  connect(ui_char_select_right, SIGNAL(clicked()), this, SLOT(on_char_select_right_clicked()));
+  connect(ui_char_select_left, SIGNAL(clicked()), this,
+          SLOT(on_char_select_left_clicked()));
+  connect(ui_char_select_right, SIGNAL(clicked()), this,
+          SLOT(on_char_select_right_clicked()));
 
   connect(ui_spectator, SIGNAL(clicked()), this, SLOT(on_spectator_clicked()));
 
-  connect(ui_char_search, SIGNAL(textEdited(const QString&)), this, SLOT(on_char_search_changed()));
-  connect(ui_char_passworded, SIGNAL(stateChanged(int)), this, SLOT(on_char_passworded_clicked()));
-  connect(ui_char_taken, SIGNAL(stateChanged(int)), this, SLOT(on_char_taken_clicked()));
+  connect(ui_char_search, SIGNAL(textEdited(const QString &)), this,
+          SLOT(on_char_search_changed()));
+  connect(ui_char_passworded, SIGNAL(stateChanged(int)), this,
+          SLOT(on_char_passworded_clicked()));
+  connect(ui_char_taken, SIGNAL(stateChanged(int)), this,
+          SLOT(on_char_taken_clicked()));
 }
 
 void Courtroom::set_char_select()
 {
   QString filename = "courtroom_design.ini";
 
-  pos_size_type f_charselect = ao_app->get_element_dimensions("char_select", filename);
+  pos_size_type f_charselect =
+      ao_app->get_element_dimensions("char_select", filename);
 
-  if (f_charselect.width < 0 || f_charselect.height < 0)
-  {
-    qDebug() << "W: did not find courtroom width or height in courtroom_design.ini!";
+  if (f_charselect.width < 0 || f_charselect.height < 0) {
+    qDebug()
+        << "W: did not find courtroom width or height in courtroom_design.ini!";
     this->resize(714, 668);
   }
   else
@@ -139,25 +142,22 @@ void Courtroom::set_char_select_page()
   ui_char_select_left->hide();
   ui_char_select_right->hide();
 
-  for (AOCharButton *i_button : ui_char_button_list)
-  {
+  for (AOCharButton *i_button : ui_char_button_list) {
     i_button->reset();
     i_button->hide();
-    i_button->move(0,0);
+    i_button->move(0, 0);
   }
 
   int total_pages = ui_char_button_list_filtered.size() / max_chars_on_page;
   int chars_on_page = 0;
 
-  if (ui_char_button_list_filtered.size() % max_chars_on_page != 0)
-  {
+  if (ui_char_button_list_filtered.size() % max_chars_on_page != 0) {
     ++total_pages;
-    //i. e. not on the last page
+    // i. e. not on the last page
     if (total_pages > current_char_page + 1)
       chars_on_page = max_chars_on_page;
     else
       chars_on_page = ui_char_button_list_filtered.size() % max_chars_on_page;
-
   }
   else
     chars_on_page = max_chars_on_page;
@@ -173,24 +173,25 @@ void Courtroom::set_char_select_page()
 
 void Courtroom::char_clicked(int n_char)
 {
-  QString char_ini_path = ao_app->get_character_path(char_list.at(n_char).name, "char.ini");
+  QString char_ini_path =
+      ao_app->get_character_path(char_list.at(n_char).name, "char.ini");
 
   qDebug() << "char_ini_path" << char_ini_path;
 
-  if (!file_exists(char_ini_path))
-  {
+  if (!file_exists(char_ini_path)) {
     call_notice(tr("Could not find %1").arg(char_ini_path, 1));
     return;
   }
 
-  if (n_char == m_cid)
-  {
+  if (n_char == m_cid) {
     enter_courtroom(m_cid);
   }
-  else
-  {
-    ao_app->send_server_packet(new AOPacket("PW#" + ui_char_password->text() + "#%"));
-    ao_app->send_server_packet(new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" + QString::number(n_char) + "#" + get_hdid() + "#%"));
+  else {
+    ao_app->send_server_packet(
+        new AOPacket("PW#" + ui_char_password->text() + "#%"));
+    ao_app->send_server_packet(
+        new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" +
+                     QString::number(n_char) + "#" + get_hdid() + "#%"));
   }
 
   ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name);
@@ -198,100 +199,94 @@ void Courtroom::char_clicked(int n_char)
 
 void Courtroom::put_button_in_place(int starting, int chars_on_this_page)
 {
-    if (ui_char_button_list_filtered.size() == 0)
-        return;
+  if (ui_char_button_list_filtered.size() == 0)
+    return;
 
-    QPoint f_spacing = ao_app->get_button_spacing("char_button_spacing", "courtroom_design.ini");
+  QPoint f_spacing =
+      ao_app->get_button_spacing("char_button_spacing", "courtroom_design.ini");
 
-    int x_spacing = f_spacing.x();
-    int x_mod_count = 0;
+  int x_spacing = f_spacing.x();
+  int x_mod_count = 0;
 
-    int y_spacing = f_spacing.y();
-    int y_mod_count = 0;
+  int y_spacing = f_spacing.y();
+  int y_mod_count = 0;
 
-    char_columns = ((ui_char_buttons->width() - button_width) / (x_spacing + button_width)) + 1;
-    char_rows = ((ui_char_buttons->height() - button_height) / (y_spacing + button_height)) + 1;
+  char_columns =
+      ((ui_char_buttons->width() - button_width) / (x_spacing + button_width)) +
+      1;
+  char_rows = ((ui_char_buttons->height() - button_height) /
+               (y_spacing + button_height)) +
+              1;
 
-    max_chars_on_page = char_columns * char_rows;
+  max_chars_on_page = char_columns * char_rows;
 
-    int startout = starting;
-    for (int n = starting ; n < startout+chars_on_this_page ; ++n)
-    {
-      int x_pos = (button_width + x_spacing) * x_mod_count;
-      int y_pos = (button_height + y_spacing) * y_mod_count;
+  int startout = starting;
+  for (int n = starting; n < startout + chars_on_this_page; ++n) {
+    int x_pos = (button_width + x_spacing) * x_mod_count;
+    int y_pos = (button_height + y_spacing) * y_mod_count;
 
-      ui_char_button_list_filtered.at(n)->move(x_pos, y_pos);
-      ui_char_button_list_filtered.at(n)->show();
-      ui_char_button_list_filtered.at(n)->apply_taken_image();
+    ui_char_button_list_filtered.at(n)->move(x_pos, y_pos);
+    ui_char_button_list_filtered.at(n)->show();
+    ui_char_button_list_filtered.at(n)->apply_taken_image();
 
-      ++x_mod_count;
+    ++x_mod_count;
 
-      if (x_mod_count == char_columns)
-      {
-        ++y_mod_count;
-        x_mod_count = 0;
-      }
+    if (x_mod_count == char_columns) {
+      ++y_mod_count;
+      x_mod_count = 0;
     }
+  }
 }
 
 void Courtroom::character_loading_finished()
 {
-    // Zeroeth, we'll clear any leftover characters from previous server visits.
-    ao_app->generated_chars = 0;
-    if (ui_char_button_list.size() > 0)
-    {
-        foreach (AOCharButton* item, ui_char_button_list) {
-            delete item;
-        }
-        ui_char_button_list.clear();
+  // Zeroeth, we'll clear any leftover characters from previous server visits.
+  ao_app->generated_chars = 0;
+  if (ui_char_button_list.size() > 0) {
+    foreach (AOCharButton *item, ui_char_button_list) {
+      delete item;
     }
+    ui_char_button_list.clear();
+  }
 
-    // First, we'll make all the character buttons in the very beginning.
-    // We also hide them all, so they can't be accidentally clicked.
-    // Later on, we'll be revealing buttons as we need them.
-    for (int n = 0; n < char_list.size(); n++)
-    {
-        AOCharButton* characterButton = new AOCharButton(ui_char_buttons, ao_app, 0, 0, char_list.at(n).taken);
-        AOCharSelectGenerationThreading *char_generate = new AOCharSelectGenerationThreading(this, n, characterButton);
-        QThreadPool::globalInstance()->start(char_generate);
-        if(QThreadPool::globalInstance()->activeThreadCount() == QThreadPool::globalInstance()->maxThreadCount())
-        {
-          QThreadPool::globalInstance()->waitForDone();
-        }
+  // First, we'll make all the character buttons in the very beginning.
+  // Since we can't trust what will happen during the multi threading process,
+  // we assign the buttons their locations in the list according to the
+  // character list.
+  for (int n = 0; n < char_list.size(); n++) {
+    AOCharButton *characterButton =
+        new AOCharButton(ui_char_buttons, ao_app, 0, 0, char_list.at(n).taken);
+    ui_char_button_list.append(characterButton);
+  }
+
+  // We also hide them all, so they can't be accidentally clicked.
+  // Later on, we'll be revealing buttons as we need them.
+  for (int n = 0; n < char_list.size(); n++) {
+    AOCharSelectGenerationThreading *char_generate =
+        new AOCharSelectGenerationThreading(this, n);
+    QThreadPool::globalInstance()->start(char_generate);
+    if (QThreadPool::globalInstance()->activeThreadCount() ==
+        QThreadPool::globalInstance()->maxThreadCount()) {
+      QThreadPool::globalInstance()->waitForDone();
     }
-    QThreadPool::globalInstance()->waitForDone();
-    filter_character_list();
+  }
+  QThreadPool::globalInstance()->waitForDone();
+  filter_character_list();
 }
 
 void Courtroom::filter_character_list()
 {
-    ui_char_button_list_filtered.clear();
-    for (int i = 0; i < char_list.size(); i++)
-    {
-        AOCharSelectFilterThreading *char_filter = new AOCharSelectFilterThreading(this, i);
-        QThreadPool::globalInstance()->start(char_filter);
-        if(QThreadPool::globalInstance()->activeThreadCount() == QThreadPool::globalInstance()->maxThreadCount())
-        {
-          QThreadPool::globalInstance()->waitForDone();
-        }
-    }
-    QThreadPool::globalInstance()->waitForDone();
+  ui_char_button_list_filtered.clear();
+  for (int i = 0; i < char_list.size(); i++) {
+    AOCharSelectFilter(this, i);
+  }
 
-    current_char_page = 0;
-    set_char_select_page();
+  current_char_page = 0;
+  set_char_select_page();
 }
 
-void Courtroom::on_char_search_changed()
-{
-    filter_character_list();
-}
+void Courtroom::on_char_search_changed() { filter_character_list(); }
 
-void Courtroom::on_char_passworded_clicked()
-{
-    filter_character_list();
-}
+void Courtroom::on_char_passworded_clicked() { filter_character_list(); }
 
-void Courtroom::on_char_taken_clicked()
-{
-    filter_character_list();
-}
+void Courtroom::on_char_taken_clicked() { filter_character_list(); }