aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorin1tiate <32779090+in1tiate@users.noreply.github.com>2021-01-09 09:17:12 -0600
committerGitHub <noreply@github.com>2021-01-09 18:17:12 +0300
commit15c3d607c616a6171118cfdd4967e35489c99312 (patch)
tree5e0d351d861644f8fe15a8a2666b11ab19e9824e /include
parent7bac3c9514f2c5b01d0c49f60849d897993765db (diff)
Log objections IC, overhaul custom objections context menu, add more configuration options per-character (#356)
* initial commit * The Quick-Fix is a secondary weapon for the Medic. It is a prototype Medi Gun with a group of three gauges on one side, a (cosmetic) ÜberCharge gauge on the other side, and what appears to be a blender for a body. The main gun is coupled with a medicinal reactor backpack with glowing portions that replaces Medic's default backpack. * fixed settings dialog * slightly less stupid custom objection default Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com> Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h3
-rw-r--r--include/aooptionsdialog.h2
-rw-r--r--include/courtroom.h8
3 files changed, 13 insertions, 0 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 790b445..3465202 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -220,6 +220,9 @@ public:
// Returns whether the log should have a timestamp.
bool get_log_timestamp();
+ // Returns whether to log IC actions.
+ bool get_log_ic_actions();
+
// Returns the username the user may have set in config.ini.
QString get_default_username();
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index fe99626..2e2d7b8 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -52,6 +52,8 @@ private:
QSpinBox *ui_log_margin_spinbox;
QLabel *ui_log_timestamp_lbl;
QCheckBox *ui_log_timestamp_cb;
+ QLabel *ui_log_ic_actions_lbl;
+ QCheckBox *ui_log_ic_actions_cb;
QFrame *ui_log_names_divider;
QLineEdit *ui_username_textbox;
QLabel *ui_username_lbl;
diff --git a/include/courtroom.h b/include/courtroom.h
index 6a00bdc..a35d830 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -332,6 +332,9 @@ private:
// True, if the log should display the message like name<br>text instead of name: text
bool log_newline = false;
+ // True, if the log should include RP actions like interjections, showing evidence, etc.
+ bool log_ic_actions = true;
+
// Margin in pixels between log entries for the IC log.
int log_margin = 0;
@@ -398,6 +401,11 @@ private:
int objection_state = 0;
QString objection_custom = "";
+ struct CustomObjection {
+ QString name;
+ QString filename;
+ };
+ QList<CustomObjection> custom_objections_list;
int realization_state = 0;
int screenshake_state = 0;
int text_color = 0;