Add additive text option where your messages are added to your previous one, fully networked and ready for the server

Adjust some pointless static bool casts to be actual logic checks

4 files changed, 13 insertions, 6 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index e4a5b7f6..f499faf0 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -79,6 +79,7 @@ public:
   bool casing_alerts_enabled = false;
   bool modcall_reason_enabled = false;
   bool looping_sfx_support_enabled = false;
+  bool additive_enabled = false;
 
   ///////////////loading info///////////////////
 
diff --git a/include/aocharmovie.h b/include/aocharmovie.h
index ec7b9522..adfa7b88 100644
--- a/include/aocharmovie.h
+++ b/include/aocharmovie.h
@@ -46,6 +46,9 @@ public:
 
   QStringList network_strings;
 
+  QString m_char;
+  QString m_emote;
+
 private:
   AOApplication *ao_app;
 
@@ -62,9 +65,6 @@ private:
   QString last_path;
   QImageReader *m_reader = new QImageReader();
 
-  QString m_char;
-  QString m_emote;
-
   QElapsedTimer actual_time;
 
   //it will forever be a mystery who thought this time_mod system would ever be a good idea with precision-based emotes
diff --git a/include/courtroom.h b/include/courtroom.h
index 304dd64f..9b3c0577 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -315,6 +315,9 @@ 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;
 
@@ -339,7 +342,7 @@ private:
   //the amount of time non-animated witness testimony/cross-examination images stay onscreen for in ms
   const int wtce_stay_time = 1500;
 
-  static const int chatmessage_size = 28;
+  static const int chatmessage_size = 29;
   QString m_chatmessage[chatmessage_size];
   bool chatmessage_is_empty = false;
 
@@ -484,6 +487,7 @@ private:
 
   QCheckBox *ui_pre;
   QCheckBox *ui_flip;
+  QCheckBox *ui_additive;
   QCheckBox *ui_guard;
   QCheckBox *ui_casing;
 
@@ -601,7 +605,7 @@ private slots:
   void on_emote_dropdown_changed(int p_index);
   void on_pos_dropdown_changed(int p_index);
 
-  void on_evidence_name_edited();
+  void on_evidence_name_edited(QString text);
   void on_evidence_image_name_edited();
   void on_evidence_image_button_clicked();
   void on_evidence_clicked(int p_id);
@@ -653,6 +657,7 @@ private slots:
 
   void on_pre_clicked();
   void on_flip_clicked();
+  void on_additive_clicked();
   void on_guard_clicked();
 
   void on_showname_enable_clicked();
diff --git a/include/datatypes.h b/include/datatypes.h
index 1b76f725..54e5c741 100644
--- a/include/datatypes.h
+++ b/include/datatypes.h
@@ -105,7 +105,8 @@ enum CHAT_MESSAGE
   SCREENSHAKE,
   FRAME_SCREENSHAKE,
   FRAME_REALIZATION,
-  FRAME_SFX
+  FRAME_SFX,
+  ADDITIVE
 };
 
 enum COLOR