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

fix incorrect emote modifier

Browse Source
This commit is contained in:
scatterflower 2020-08-16 13:53:16 -05:00
parent 1c5b097f65
commit 95725eb129
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/courtroom.cpp
View File

@ -1613,7 +1613,7 @@ void Courtroom::on_chat_return_pressed()
if (f_emote_mod == 0) if (f_emote_mod == 0)
f_emote_mod = 1; f_emote_mod = 1;
else if (f_emote_mod == 5 && ao_app->prezoom_enabled) else if (f_emote_mod == 5 && ao_app->prezoom_enabled)
f_emote_mod = 4; f_emote_mod = 6;
} }
else { else {
if (f_emote_mod == 1) if (f_emote_mod == 1)
@ -1772,7 +1772,6 @@ void Courtroom::reset_ic(){
} }
void Courtroom::reset_ui(){ void Courtroom::reset_ui(){
if (m_chatmessage[CHAR_ID].toInt() == m_cid) {
ui_ic_chat_message->clear(); ui_ic_chat_message->clear();
if (ui_additive->isChecked()) if (ui_additive->isChecked())
ui_ic_chat_message->insert(" "); ui_ic_chat_message->insert(" ");
@ -1789,7 +1788,6 @@ void Courtroom::reset_ui(){
ui_realization->set_image("realization"); ui_realization->set_image("realization");
ui_screenshake->set_image("screenshake"); ui_screenshake->set_image("screenshake");
ui_evidence_present->set_image("present"); ui_evidence_present->set_image("present");
}
} }
void Courtroom::handle_chatmessage(QStringList *p_contents) void Courtroom::handle_chatmessage(QStringList *p_contents)
@ -1851,7 +1849,9 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
reset_ic(); reset_ic();
// Reset UI elements after client message gets sent // Reset UI elements after client message gets sent
reset_ui(); if (m_chatmessage[CHAR_ID].toInt() == m_cid) {
reset_ui();
}
// Let the server handle actually checking if they're allowed to do this. // Let the server handle actually checking if they're allowed to do this.
is_additive = m_chatmessage[ADDITIVE].toInt() == 1; is_additive = m_chatmessage[ADDITIVE].toInt() == 1;