diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2021-01-09 12:35:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 12:35:09 -0600 |
| commit | 41c134b1be39de2d888e0064fa6fbe8fae8915b6 (patch) | |
| tree | 0567ad13682c9f2426bdc34c8286ff1a8969011b /include | |
| parent | 3993ba47e5f801d603b5da973d5e5e57eba14b0b (diff) | |
| parent | 5b34df1c5a6da97ad426a6cfb4a7c43c03fb0aad (diff) | |
Merge pull request #387 from AttorneyOnline/feature/immediate
Rename noninterrupting bonanza to consistent and short "immediate" instead
Diffstat (limited to 'include')
| -rw-r--r-- | include/courtroom.h | 4 | ||||
| -rw-r--r-- | include/datatypes.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/courtroom.h b/include/courtroom.h index d9c843a..5fdbbac 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -236,7 +236,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 @@ -610,7 +610,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 21ade04..ebf2e38 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, |