aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-09-20 23:32:32 +0200
committerCerapter <cerap@protonmail.com>2018-09-20 23:32:32 +0200
commit21aaa90c44408942ec77236cfc1a721f08ad7b55 (patch)
tree86a14f79356ec4e35703d67f1da9c66074a61d91
parentff0f8c268a36129635a8d9f459a9e511b599260f (diff)
Made objections not necessarily play a pre, unless you have Pre ticked.
-rw-r--r--courtroom.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/courtroom.cpp b/courtroom.cpp
index 48e456f..109ffa6 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -1095,10 +1095,13 @@ void Courtroom::on_chat_return_pressed()
//needed or else legacy won't understand what we're saying
if (objection_state > 0)
{
- if (f_emote_mod == 5)
- f_emote_mod = 6;
- else
- f_emote_mod = 2;
+ if (ui_pre->isChecked())
+ {
+ if (f_emote_mod == 5)
+ f_emote_mod = 6;
+ else
+ f_emote_mod = 2;
+ }
}
else if (ui_pre->isChecked() and !ui_pre_non_interrupt->isChecked())
{