diff options
| author | David Skoland <davidskoland@gmail.com> | 2017-02-10 15:34:33 +0100 |
|---|---|---|
| committer | David Skoland <davidskoland@gmail.com> | 2017-02-10 15:34:33 +0100 |
| commit | 79bf77c925102643f22b686caab97f126a68db15 (patch) | |
| tree | 348ae1b932c2e13a8a55568c7a2ba56959deb4fd /courtroom.cpp | |
| parent | 8428939fd35603cb41ab227be15a129c3d819729 (diff) | |
fixed some minor bugs
Diffstat (limited to 'courtroom.cpp')
| -rw-r--r-- | courtroom.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/courtroom.cpp b/courtroom.cpp index 8fc7cd0a..d7f6ea71 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -719,6 +719,9 @@ void Courtroom::on_chat_return_pressed() if (ui_ic_chat_message->text() == "" || is_muted) return; + if (anim_state < 3 || text_state < 2) + return; + //MS#chat# //pre-emote# //character# @@ -826,7 +829,12 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) m_chatmessage[n_string] = p_contents->at(n_string); } - QString f_message = m_chatmessage[CHAR_NAME] + ": " + m_chatmessage[MESSAGE] + '\n'; + QString f_showname = ao_app->get_showname(m_chatmessage[CHAR_NAME]); + + if (f_showname == "") + f_showname = m_chatmessage[CHAR_NAME]; + + QString f_message = f_showname + ": " + m_chatmessage[MESSAGE] + '\n'; if (f_message == previous_ic_message) return; @@ -953,8 +961,8 @@ void Courtroom::handle_chatmessage_3() int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); - if (emote_mod == 4 || - emote_mod == 5) + if (emote_mod == 5 || + emote_mod == 6) { QString side = m_chatmessage[SIDE]; ui_vp_desk->hide(); |