aboutsummaryrefslogtreecommitdiff
path: root/src/courtroom.cpp
diff options
context:
space:
mode:
authorin1tiate <32779090+in1tiate@users.noreply.github.com>2024-05-20 09:03:16 -0500
committerin1tiate <32779090+in1tiate@users.noreply.github.com>2024-05-20 09:03:16 -0500
commita23614059b67f57d7a2d66ad67aec6770dd3788d (patch)
tree690be328a7d5bc5a9256545b62e9cd3491c05488 /src/courtroom.cpp
parent6ff71de06b829f46eede5d697dae1b637e328795 (diff)
add missing code from rebase
Diffstat (limited to 'src/courtroom.cpp')
-rw-r--r--src/courtroom.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 0d7dd6d7..2f7e3ed5 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2303,7 +2303,10 @@ void Courtroom::on_chat_return_pressed()
}
}
- packet_contents.append(ao_app->get_blipname(current_char, current_emote));
+ if (ao_app->m_serverdata.get_feature(server::BASE_FEATURE_SET::CUSTOM_BLIPS)) {
+ packet_contents.append(ao_app->get_blipname(current_char, current_emote));
+ }
+ packet_contents.append(ui_slide_enable->isChecked() ? "1" : "0"); // just let the server figure out what to do with this
ao_app->send_server_packet(AOPacket("MS", packet_contents));
}