Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat emote_mod logic (#307)

Browse Source 
Interjections should not force preanimation if 'Pre' is unchecked.
This commit is contained in:
in1tiate 2020-11-09 15:05:21 -06:00 committed by GitHub
parent 5aee23d56b
commit 1502a18593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/courtroom.cpp
View File

@ -1596,13 +1596,11 @@ void Courtroom::on_chat_return_pressed()
int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote); int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
// needed or else legacy won't understand what we're saying // needed or else legacy won't understand what we're saying
if (objection_state > 0) { if (objection_state > 0 && ui_pre->isChecked()) {
if (ui_pre->isChecked()) { if (f_emote_mod == 4 || f_emote_mod == 5)
if (f_emote_mod == 4 || f_emote_mod == 5) f_emote_mod = 6;
f_emote_mod = 6; else
else f_emote_mod = 2;
f_emote_mod = 2;
}
} }
else if (ui_pre->isChecked() && !ui_pre_non_interrupt->isChecked()) { else if (ui_pre->isChecked() && !ui_pre_non_interrupt->isChecked()) {
if (f_emote_mod == 0) if (f_emote_mod == 0)