diff options
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 326f2ad0..7df942bb 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1657,7 +1657,7 @@ void Courtroom::enter_courtroom() ui_flip->hide(); } - if (ao_app->additive_text_supported) + if (ao_app->additive_supported) { ui_additive->show(); } @@ -2179,7 +2179,7 @@ void Courtroom::on_chat_return_pressed() } else { - packet_contents.append(""); + packet_contents.append(ao_app->get_showname(current_char, current_emote)); } // Similarly, we send over whom we're paired with, unless we have chosen @@ -2251,7 +2251,7 @@ void Courtroom::on_chat_return_pressed() } } - if (ao_app->additive_text_supported) + if (ao_app->additive_supported) { packet_contents.append(ui_additive->isChecked() ? "1" : "0"); } @@ -2276,6 +2276,8 @@ void Courtroom::on_chat_return_pressed() } } + packet_contents.append(ao_app->get_blipname(current_char, current_emote)); + ao_app->send_server_packet(AOPacket("MS", packet_contents)); } @@ -3993,7 +3995,11 @@ void Courtroom::start_chat_ticking() gen_char_rgb_list(current_misc); } - QString f_blips = ao_app->get_blips(m_chatmessage[CHAR_NAME]); + QString f_blips = ao_app->get_blipname(m_chatmessage[CHAR_NAME]); + f_blips = ao_app->get_blips(f_blips); + if (ao_app->custom_blips_supported && !m_chatmessage[BLIPNAME].isEmpty()) { + f_blips = ao_app->get_blips(m_chatmessage[BLIPNAME]); + } blip_player->set_blips(f_blips); // means text is currently ticking |