implemented text color change

4 files changed, 23 insertions, 0 deletions

diff --git a/aoapplication.h b/aoapplication.h
index cb9c102c..b195ffda 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -43,8 +43,11 @@ public:
 
   unsigned int s_decryptor = 5;
   bool encryption_needed = true;
+  //T0D0: make this obsolete and break into smaller bools
   bool ao2_features = false;
 
+  bool yellow_text_enabled = false;
+
   ///////////////loading info///////////////////
 
   //player number, it's hardly used but might be needed for some old servers
diff --git a/courtroom.cpp b/courtroom.cpp
index 9c4fa328..fa56dadd 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -120,6 +120,13 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
   ui_prosecution_minus = new AOButton(this, ao_app);
 
   ui_text_color = new QComboBox(this);
+  ui_text_color->addItem("White");
+  ui_text_color->addItem("Green");
+  ui_text_color->addItem("Red");
+  ui_text_color->addItem("Orange");
+  ui_text_color->addItem("Blue");
+  if (ao_app->yellow_text_enabled)
+    ui_text_color->addItem("Yellow");
 
   ui_music_slider = new QSlider(Qt::Horizontal, this);
   ui_music_slider->setRange(0, 100);
@@ -214,6 +221,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
   connect(ui_prosecution_minus, SIGNAL(clicked()), this, SLOT(on_prosecution_minus_clicked()));
   connect(ui_prosecution_plus, SIGNAL(clicked()), this, SLOT(on_prosecution_plus_clicked()));
 
+  connect(ui_text_color, SIGNAL(currentIndexChanged(int)), this, SLOT(on_text_color_changed(int)));
+
   connect(ui_ooc_toggle, SIGNAL(clicked()), this, SLOT(on_ooc_toggle_clicked()));
 
   connect(ui_music_search, SIGNAL(textChanged(QString)), this, SLOT(on_music_search_edited(QString)));
@@ -1415,6 +1424,11 @@ void Courtroom::on_prosecution_plus_clicked()
     ao_app->send_server_packet(new AOPacket("HP#2#" + QString::number(f_state) + "#%"));
 }
 
+void Courtroom::on_text_color_changed(int p_color)
+{
+  text_color = p_color;
+}
+
 void Courtroom::on_witness_testimony_clicked()
 {
   ao_app->send_server_packet(new AOPacket("RT#testimony1#%"));
diff --git a/courtroom.h b/courtroom.h
index 5bcd8bb5..e701f857 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -285,6 +285,8 @@ private slots:
   void on_prosecution_minus_clicked();
   void on_prosecution_plus_clicked();
 
+  void on_text_color_changed(int p_color);
+
   void on_ooc_toggle_clicked();
 
   void on_witness_testimony_clicked();
diff --git a/packet_distribution.cpp b/packet_distribution.cpp
index 1829e068..70dd248d 100644
--- a/packet_distribution.cpp
+++ b/packet_distribution.cpp
@@ -107,6 +107,10 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (f_contents.size() < 2)
       goto end;
 
+    ao2_features = false;
+    yellow_text_enabled = false;
+    encryption_needed = true;
+
     //T0D0: store server version
   }
   else if (header == "CT")