aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/courtroom.h4
-rw-r--r--include/datatypes.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/courtroom.h b/include/courtroom.h
index a35d8301..94a115ff 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -233,7 +233,7 @@ public:
// the second is the char id of who played it
void handle_song(QStringList *p_contents);
- void play_preanim(bool noninterrupting);
+ void play_preanim(bool immediate);
// plays the witness testimony or cross examination animation based on
// argument
@@ -607,7 +607,7 @@ private:
QCheckBox *ui_guard;
QCheckBox *ui_casing;
- QCheckBox *ui_pre_non_interrupt;
+ QCheckBox *ui_immediate;
QCheckBox *ui_showname_enable;
AOButton *ui_custom_objection;
diff --git a/include/datatypes.h b/include/datatypes.h
index 21ade040..ebf2e380 100644
--- a/include/datatypes.h
+++ b/include/datatypes.h
@@ -91,7 +91,7 @@ enum CHAT_MESSAGE {
SELF_OFFSET,
OTHER_OFFSET,
OTHER_FLIP,
- NONINTERRUPTING_PRE,
+ IMMEDIATE,
LOOPING_SFX,
SCREENSHAKE,
FRAME_SCREENSHAKE,