aboutsummaryrefslogtreecommitdiff
path: root/courtroom.h
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-09-05 17:21:27 +0200
committerCerapter <cerap@protonmail.com>2018-09-05 17:21:27 +0200
commit93cd2ad3747ff609e0aa2175a2622afe9ef6b56d (patch)
treefbf526448212aeaee293e77ab59e78db8989bc8b /courtroom.h
parent78c339869d64295da3d6aef5577a16f7fdc49b78 (diff)
Non-interrupting pres.
Diffstat (limited to 'courtroom.h')
-rw-r--r--courtroom.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/courtroom.h b/courtroom.h
index 19a19ea9..d15dde0e 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -184,6 +184,7 @@ public:
void handle_song(QStringList *p_contents);
void play_preanim();
+ void play_noninterrupting_preanim();
//plays the witness testimony or cross examination animation based on argument
void handle_wtce(QString p_wtce, int variant);
@@ -298,7 +299,7 @@ private:
//every time point in char.inis times this equals the final time
const int time_mod = 40;
- static const int chatmessage_size = 22;
+ static const int chatmessage_size = 23;
QString m_chatmessage[chatmessage_size];
bool chatmessage_is_empty = false;
@@ -319,7 +320,7 @@ private:
bool is_muted = false;
- //state of animation, 0 = objecting, 1 = preanim, 2 = talking, 3 = idle
+ //state of animation, 0 = objecting, 1 = preanim, 2 = talking, 3 = idle, 4 = noniterrupting preanim
int anim_state = 3;
//state of text ticking, 0 = not yet ticking, 1 = ticking in progress, 2 = ticking done
@@ -451,6 +452,7 @@ private:
QCheckBox *ui_flip;
QCheckBox *ui_guard;
+ QCheckBox *ui_pre_non_interrupt;
QCheckBox *ui_showname_enable;
AOButton *ui_custom_objection;