diff options
| author | in1tiate <32779090+in1tiate@users.noreply.github.com> | 2020-11-09 15:05:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 15:05:21 -0600 |
| commit | 1502a1859336e92a2c92e960475f2c5fa1ed3f3f (patch) | |
| tree | 048363f7d73099fab0218e50b2f9dd4690ce5bac | |
| parent | 5aee23d56bc2153e830bb82d146c6188e57045d0 (diff) | |
Reformat emote_mod logic (#307)
Interjections should not force preanimation if 'Pre' is unchecked.
| -rw-r--r-- | src/courtroom.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 35c2eac1..e27603bb 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1596,13 +1596,11 @@ void Courtroom::on_chat_return_pressed() int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote); // needed or else legacy won't understand what we're saying - if (objection_state > 0) { - if (ui_pre->isChecked()) { - if (f_emote_mod == 4 || f_emote_mod == 5) - f_emote_mod = 6; - else - f_emote_mod = 2; - } + if (objection_state > 0 && ui_pre->isChecked()) { + if (f_emote_mod == 4 || f_emote_mod == 5) + f_emote_mod = 6; + else + f_emote_mod = 2; } else if (ui_pre->isChecked() && !ui_pre_non_interrupt->isChecked()) { if (f_emote_mod == 0) |