diff options
| author | Crystalwarrior <Varsash@Gmail.com> | 2022-03-25 16:01:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 16:01:39 +0300 |
| commit | ca83573d1bb7c7c80e6478de78eea14e108389d7 (patch) | |
| tree | 1ad753e1e4e2c4a1f46e7bc765b5281888ed245e /src/emotes.cpp | |
| parent | 7af4d285c2a581c6901a2f6d5f888f1feb875c95 (diff) | |
Objections no longer force you into preanimations (#697)
* Make objections respect the user's preanim setting
* Replace all magic numbers with the emote mod enum
Fix preanim zoom not toggling the checkbox from char.ini, but deprecated "4" doing it
* Comment handle_emote_mod a bit better to explain some jank
* Fix play SFX logic being inconsistent during narrator chat (emote is "")
* hail clang-tidy
Diffstat (limited to 'src/emotes.cpp')
| -rw-r--r-- | src/emotes.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/emotes.cpp b/src/emotes.cpp index 547dc0ea..3c06d439 100644 --- a/src/emotes.cpp +++ b/src/emotes.cpp @@ -174,10 +174,12 @@ void Courtroom::select_emote(int p_id) ui_pre->setChecked(!ui_pre->isChecked()); } else if (!ao_app->is_stickypres_enabled()) { - if (emote_mod == 1 || emote_mod == 4) + if (emote_mod == PREANIM || emote_mod == PREANIM_ZOOM) { ui_pre->setChecked(true); - else + } + else { ui_pre->setChecked(false); + } } ui_emote_dropdown->setCurrentIndex(current_emote); |
