aboutsummaryrefslogtreecommitdiff
path: root/courtroom.h
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-09-03 12:55:57 +0200
committerCerapter <cerap@protonmail.com>2018-09-03 12:55:57 +0200
commit22e0cb8e1a97e57a6235c23afc6508f5e441aefc (patch)
treec52badf9edec4561b4b158002266037d3f0d9a50 /courtroom.h
parent739142f8ddd194b7f4ed42fe813979655d04262a (diff)
Dual characters on screen Part 2.
- UI option to change pairup. - Fixed a bug on the prosecution side. - Dual characters now allow for iniswapped characters. - Zooming now doesn't stay on the field, instead, the game defaults to the last emote.
Diffstat (limited to 'courtroom.h')
-rw-r--r--courtroom.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/courtroom.h b/courtroom.h
index ad00b725..194298f6 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -85,6 +85,9 @@ public:
//sets the local mute list based on characters available on the server
void set_mute_list();
+ // Sets the local pair list based on the characters available on the server.
+ void set_pair_list();
+
//sets desk and bg based on pos in chatmessage
void set_scene();
@@ -246,7 +249,7 @@ private:
//every time point in char.inis times this equals the final time
const int time_mod = 40;
- static const int chatmessage_size = 21;
+ static const int chatmessage_size = 22;
QString m_chatmessage[chatmessage_size];
bool chatmessage_is_empty = false;
@@ -350,6 +353,10 @@ private:
QListWidget *ui_area_list;
QListWidget *ui_music_list;
+ AOButton *ui_pair_button;
+ QListWidget *ui_pair_list;
+ QSpinBox *ui_pair_offset_spinbox;
+
QLineEdit *ui_ic_chat_message;
QLineEdit *ui_ic_chat_name;
@@ -487,6 +494,7 @@ private slots:
void chat_tick();
void on_mute_list_clicked(QModelIndex p_index);
+ void on_pair_list_clicked(QModelIndex p_index);
void on_chat_return_pressed();
@@ -525,6 +533,7 @@ private slots:
void on_realization_clicked();
void on_mute_clicked();
+ void on_pair_clicked();
void on_defense_minus_clicked();
void on_defense_plus_clicked();
@@ -538,6 +547,7 @@ private slots:
void on_blip_slider_moved(int p_value);
void on_log_limit_changed(int value);
+ void on_pair_offset_changed(int value);
void on_ooc_toggle_clicked();