Merge pull request #246 from AttorneyOnline/2.8

Merges 2.8.5, which is a patch release for 2.8 with no substantially new features.

This commit is release-ready.

1 files changed, 37 insertions, 14 deletions

diff --git a/include/courtroom.h b/include/courtroom.h
index 182c2a68..5b5ff6c1 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -109,7 +109,6 @@ public:
       if (arup_locks.size() > place)
         arup_locks[place] = value;
     }
-    list_areas();
   }
 
   void character_loading_finished();
@@ -118,7 +117,9 @@ public:
   void set_widgets();
 
   // sets font size based on theme ini files
-  void set_font(QWidget *widget, QString class_name, QString p_identifier, QString p_char="", QString font_name="", int f_pointsize=0);
+  void set_font(QWidget *widget, QString class_name, QString p_identifier,
+                QString p_char = "", QString font_name = "",
+                int f_pointsize = 0);
 
   // Get the properly constructed font
   QFont get_qfont(QString font_name, int f_pointsize, bool antialias = true);
@@ -128,7 +129,7 @@ public:
                  QColor f_color = Qt::black, bool bold = false);
 
   // helper function that calls above function on the relevant widgets
-  void set_fonts(QString p_char="");
+  void set_fonts(QString p_char = "");
 
   // sets dropdown menu stylesheet
   void set_dropdown(QWidget *widget);
@@ -217,11 +218,14 @@ public:
   QString filter_ic_text(QString p_text, bool colorize = false, int pos = -1,
                          int default_color = 0);
 
+  void log_ic_text(QString p_name, QString p_showname, QString p_message, QString p_action="", int p_color=0);
+
   // adds text to the IC chatlog. p_name first as bold then p_text then a newlin
   // this function keeps the chatlog scrolled to the top unless there's text
   // selected
   // or the user isn't already scrolled to the top
-  void append_ic_text(QString p_text, QString p_name = "", QString action = "", int color = 0);
+  void append_ic_text(QString p_text, QString p_name = "", QString action = "",
+                      int color = 0);
 
   // prints who played the song to IC chat and plays said song(if found on local
   // filesystem) takes in a list where the first element is the song name and
@@ -260,7 +264,6 @@ private:
   int m_viewport_width = 256;
   int m_viewport_height = 192;
 
-  bool first_message_sent = false;
   int maximumMessages = 0;
 
   QParallelAnimationGroup *screenshake_animation_group =
@@ -313,14 +316,23 @@ private:
   bool rainbow_appended = false;
   bool blank_blip = false;
 
-  // Whether or not is this message additive to the previous one
-  bool is_additive = false;
-
   // Used for getting the current maximum blocks allowed in the IC chatlog.
   int log_maximum_blocks = 0;
 
   // True, if the log should go downwards.
-  bool log_goes_downwards = false;
+  bool log_goes_downwards = true;
+
+  // True, if log should display colors.
+  bool log_colors = true;
+
+  // True, if the log should display the message like name<br>text instead of name: text
+  bool log_newline = false;
+
+  // Margin in pixels between log entries for the IC log.
+  int log_margin = 0;
+
+  // True, if the log should have a timestamp.
+  bool log_timestamp = false;
 
   // delay before chat messages starts ticking
   QTimer *text_delay_timer;
@@ -349,9 +361,10 @@ private:
   // amount by which we multiply the delay when we parse punctuation chars
   const int punctuation_modifier = 3;
 
-  static const int chatmessage_size = 30;
-  QString m_chatmessage[chatmessage_size];
-  bool chatmessage_is_empty = false;
+  // Minumum and maximum number of parameters in the MS packet
+  static const int MS_MINIMUM = 15;
+  static const int MS_MAXIMUM = 30;
+  QString m_chatmessage[MS_MAXIMUM];
 
   QString previous_ic_message = "";
   QString additive_previous = "";
@@ -458,6 +471,14 @@ private:
   QString current_background = "default";
   QString current_side = "";
 
+  QBrush free_brush;
+  QBrush lfp_brush;
+  QBrush casing_brush;
+  QBrush recess_brush;
+  QBrush rp_brush;
+  QBrush gaming_brush;
+  QBrush locked_brush;
+
   AOMusicPlayer *music_player;
   AOSfxPlayer *sfx_player;
   AOSfxPlayer *objection_player;
@@ -639,6 +660,10 @@ private:
   void refresh_evidence();
   void set_evidence_page();
 
+  void reset_ic();
+  void reset_ui();
+
+  void regenerate_ic_chatlog();
 public slots:
   void objection_done();
   void preanim_done();
@@ -803,8 +828,6 @@ private slots:
   void on_casing_clicked();
 
   void ping_server();
-
-  void load_bass_opus_plugin();
 };
 
 #endif // COURTROOM_H