diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-01-09 18:43:24 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-01-09 18:43:24 +0300 |
| commit | 5b34df1c5a6da97ad426a6cfb4a7c43c03fb0aad (patch) | |
| tree | 5531bd30abe8fb00f8b056641eb5a5c9b36e6b58 /include | |
| parent | 883fa8547d2d650ab28fcc91169e1d0068760ac9 (diff) | |
Rename noninterrupting_preanim and all its associated bullshit with more cooler and nicer bro immediate
In themes, pre_no_interrupt old-style name is still supported if we cannot find "immediate"
Resolves https://github.com/AttorneyOnline/AO2-Client/issues/64
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 a35d830..94a115f 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 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, |