Rewrite pairing character ordering logic to instead operate based on a user-accessible drpodown menu (it's a dropdown for the future when there's more options)

Fix current charmovie breaking offsets
Make pairing offsets applicable even without a pairing partner, making it a generic offset
Fix the chat message hardcoding max colors to 8 (when it should be max_colors)
Come up with a way to convey the ordering information without creating an extra new packet in a cool way (backwards compatibility AND less clutter!)
More info on the evidence_x and evidence_ok tooltips
Don't mute music when you switch to CSS anymore

1 files changed, 7 insertions, 1 deletions

diff --git a/include/courtroom.h b/include/courtroom.h
index c680de0..aeef3ca 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -266,7 +266,10 @@ private:
   int other_charid = -1;
 
   // The offset this user has given if they want to appear alongside someone.
-  int offset_with_pair = 0;
+  int char_offset = 0;
+
+  // 0 = in front, 1 = behind
+  int pair_order = 0;
 
   QVector<char_type> char_list;
   QVector<evi_type> evidence_list;
@@ -464,6 +467,8 @@ private:
   QListWidget *ui_pair_list;
   QSpinBox *ui_pair_offset_spinbox;
 
+  QComboBox *ui_pair_order_dropdown;
+
   AOLineEdit *ui_ic_chat_message;
   QLineEdit *ui_ic_chat_name;
 
@@ -672,6 +677,7 @@ private slots:
 
   void on_mute_clicked();
   void on_pair_clicked();
+  void on_pair_order_dropdown_changed(int p_index);
 
   void on_defense_minus_clicked();
   void on_defense_plus_clicked();