characters now load successfully

lobby.cpp

@@ -50,68 +50,79 @@ void Lobby::set_widgets()
   ao_app->set_user_theme();
 
   ui_background->set_image("lobbybackground.png");
-  ui_background->move(0, 0);
   ui_background->resize(m_lobby_width, m_lobby_height);
 
   ui_public_servers->set_image("publicservers_selected.png");
-  ui_public_servers->move(46, 88);
+  set_size_and_pos(ui_public_servers, "public_servers");
-  ui_public_servers->resize(114, 30);
 
   ui_favorites->set_image("favorites.png");
-  ui_favorites->move(164, 88);
+  set_size_and_pos(ui_favorites, "favorites");
-  ui_favorites->resize(114, 30);
 
   ui_refresh->set_image("refresh.png");
-  ui_refresh->move(56, 381);
+  set_size_and_pos(ui_refresh, "refresh");
-  ui_refresh->resize(132, 28);
 
   ui_add_to_fav->set_image("addtofav.png");
-  ui_add_to_fav->move(194, 381);
+  set_size_and_pos(ui_add_to_fav, "add_to_fav");
-  ui_add_to_fav->resize(132, 28);
 
   ui_connect->set_image("connect.png");
-  ui_connect->move(332, 381);
+  set_size_and_pos(ui_connect, "connect");
-  ui_connect->resize(132, 28);
 
   ui_about->set_image("about.png");
-  ui_about->move(428, 1);
+  set_size_and_pos(ui_about, "about");
-  ui_about->resize(88, 21);
 
-  ui_server_list->move(20, 125);
+  set_size_and_pos(ui_server_list, "server_list");
-  ui_server_list->resize(286, 240);
   ui_server_list->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
-                                "font: bold;");
+                                  "font: bold;");
 
-  ui_player_count->move(336, 91);
+  set_size_and_pos(ui_player_count, "player_count");
-  ui_player_count->resize(173, 16);
   ui_player_count->setText("Offline");
   ui_player_count->setStyleSheet("font: bold;"
                                  "color: white;"
                                  "qproperty-alignment: AlignCenter;");
 
-  ui_description->move(337, 109);
+  set_size_and_pos(ui_description, "description");
-  ui_description->resize(173, 245);
   ui_description->setReadOnly(true);
   ui_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                 "color: white;");
 
-  ui_chatbox->move(2, 445);
+  set_size_and_pos(ui_chatbox, "chatbox");
-  ui_chatbox->resize(515, 198);
   ui_chatbox->setReadOnly(true);
   ui_chatbox->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
 
-  ui_chatname->move(3, 646);
+  set_size_and_pos(ui_chatname, "chatname");
-  ui_chatname->resize(85, 19);
   ui_chatname->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                              "selection-background-color: rgba(0, 0, 0, 0);");
 
-  ui_chatmessage->move(93, 646);
+  set_size_and_pos(ui_chatmessage, "chatmessage");
-  ui_chatmessage->resize(424, 19);
   ui_chatmessage->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                 "selection-background-color: rgba(0, 0, 0, 0);");
 
 }
 
+void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
+{
+  QString design_ini_path = ao_app->get_theme_path() + "lobby_design.ini";
+  QString default_ini_path = ao_app->get_base_path() + "themes/default/lobby_design.ini";
+
+  pos_size_type design_ini_result = ao_app->get_pos_and_size(p_identifier, design_ini_path);
+
+  if (design_ini_result.width < 0 || design_ini_result.height < 0)
+  {
+    design_ini_result = ao_app->get_pos_and_size(p_identifier, default_ini_path);
+
+    if (design_ini_result.width < 0 || design_ini_result.height < 0)
+    {
+      //at this point it's pretty much game over
+      //T0D0: add message box
+      qDebug() << "CRITICAL ERROR: NO SUITABLE DATA FOR SETTING " << p_identifier;
+      ao_app->quit();
+    }
+  }
+
+  p_widget->move(design_ini_result.x, design_ini_result.y);
+  p_widget->resize(design_ini_result.width, design_ini_result.height);
+}
+
 void Lobby::on_public_servers_clicked()
 {
   ui_public_servers->set_image("publicservers_selected.png");
@@ -147,8 +158,6 @@ void Lobby::on_refresh_released()
   AOPacket *f_packet = new AOPacket("ALL#%");
 
   ao_app->send_ms_packet(f_packet);
-
-  delete f_packet;
 }
 
 void Lobby::on_add_to_fav_pressed()
@@ -179,8 +188,6 @@ void Lobby::on_connect_released()
   AOPacket *f_packet = new AOPacket("askchaa#%");
 
   ao_app->send_server_packet(f_packet);
-
-  delete f_packet;
 }
 
 void Lobby::on_about_clicked()
@@ -233,8 +240,6 @@ void Lobby::on_chatfield_return_pressed()
   ao_app->send_ms_packet(f_packet);
 
   ui_chatmessage->clear();
-
-  delete f_packet;
 }
 
 void Lobby::list_servers()

lobby.h

@@ -57,6 +57,8 @@ private:
   QLineEdit *ui_chatname;
   QLineEdit *ui_chatmessage;
 
+  void set_size_and_pos(QWidget *p_widget, QString p_identifier);
+
 private slots:
   void on_public_servers_clicked();
   void on_favorites_clicked();

networkmanager.cpp

@@ -78,8 +78,6 @@ void NetworkManager::handle_ms_packet()
     AOPacket *f_packet = new AOPacket(packet);
 
     ao_app->ms_packet_received(f_packet);
-
-    delete f_packet;
   }
 }
 
@@ -114,8 +112,6 @@ void NetworkManager::handle_server_packet()
     AOPacket *f_packet = new AOPacket(packet);
 
     ao_app->server_packet_received(f_packet);
-
-    delete f_packet;
   }
 }
 

packet_distribution.cpp

@@ -1,6 +1,7 @@
 #include "aoapplication.h"
 
 #include "lobby.h"
+#include "courtroom.h"
 #include "networkmanager.h"
 #include "encryption_functions.h"
 #include "hardware_functions.h"
@@ -91,8 +92,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     AOPacket *hi_packet = new AOPacket("HI#" + f_hdid + "#%");
     send_server_packet(hi_packet);
-
-    delete hi_packet;
   }
   else if (header == "ID")
   {
@@ -128,7 +127,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
   }
   else if (header == "SI")
   {
-    if (f_contents.size() > 3)
+    if (f_contents.size() < 3)
       return;
 
     char_list_size = f_contents.at(0).toInt();
@@ -144,17 +143,46 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     AOPacket *f_packet = new AOPacket("askchar2#%");
     send_server_packet(f_packet);
-    delete f_packet;
   }
   else if (header == "CI")
   {
     if (!courtroom_constructed)
       return;
-    AOPacket *f_packet = new AOPacket("AN#1#%");
-    send_server_packet(f_packet);
-    delete f_packet;
 
-    //w_courtroom->append_char();
+    for (int n_element = 0 ; n_element < f_contents.size() ; n_element += 2)
+    {
+      if (f_contents.at(n_element).toInt() != loaded_chars)
+        break;
+
+      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);
+
+      ++loaded_chars;
+      qDebug() << "loaded_chars" << loaded_chars;
+
+      w_courtroom->append_char(f_char);
+
+
+      qDebug() << f_contents.at(n_element + 1);
+    }
+
+    if (loaded_chars < char_list_size)
+    {
+      qDebug() << "loaded_chars" << loaded_chars;
+      QString next_packet_number = QString::number(((loaded_chars - 1) / 10) + 1);
+      AOPacket *f_packet = new AOPacket("AN#" + next_packet_number + "#%");
+      send_server_packet(f_packet);
+    }
+
+
 
   }
 }
@@ -168,6 +196,8 @@ void AOApplication::send_ms_packet(AOPacket *p_packet)
   net_manager->ship_ms_packet(f_packet);
 
   qDebug() << "S(ms):" << f_packet;
+
+  delete p_packet;
 }
 
 void AOApplication::send_server_packet(AOPacket *p_packet)
@@ -190,4 +220,5 @@ void AOApplication::send_server_packet(AOPacket *p_packet)
 
   net_manager->ship_server_packet(f_packet);
 
+  delete p_packet;
 }