aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2021-09-17 22:09:22 -0500
committerGitHub <noreply@github.com>2021-09-17 22:09:22 -0500
commit15c2aa32e6d02a062f0d2b80beb24119de66b68d (patch)
tree358041e4e8270963d43eb18ab9289b40479c7068
parent74d01e81fbcb9e423cd18ee90eacddbb47f01b14 (diff)
parent97b1757da9956dc701a81cb319282ab141819b40 (diff)
Merge pull request #589 from Salanto/remove-/pair-ooc_command
Remove /pair as a client-side command
-rw-r--r--src/courtroom.cpp46
1 files changed, 0 insertions, 46 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 389dd74f..9d0ead76 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4010,52 +4010,6 @@ void Courtroom::on_ooc_return_pressed()
"1");
return;
}
- else if (ooc_message.startsWith("/pair")) {
- ui_ooc_chat_message->clear();
- ooc_message.remove(0, 6);
-
- bool ok;
- int whom = ooc_message.toInt(&ok);
- if (ok) {
- if (whom > -1) {
- other_charid = whom;
- QString msg = tr("You will now pair up with %1 if they also choose "
- "your character in return.")
- .arg(char_list.at(whom).name);
- append_server_chatmessage("CLIENT", msg, "1");
- }
- else {
- other_charid = -1;
- append_server_chatmessage(
- "CLIENT", tr("You are no longer paired with anyone."), "1");
- }
- }
- else {
- int whom = 0;
- bool matched = false;
- for (char_type chara : char_list) {
- if (chara.name.toLower() == ooc_message.toLower()) {
- matched = true;
- break;
- }
- whom++;
- }
- if (matched) {
- other_charid = whom;
- QString msg = tr("You will now pair up with %1 if they also choose "
- "your character in return.")
- .arg(char_list.at(whom).name);
- append_server_chatmessage("CLIENT", msg, "1");
- }
- else {
- append_server_chatmessage("CLIENT",
- tr("Are you sure you typed that well? The char "
- "ID/name could not be recognised."),
- "1");
- }
- }
- return;
- }
else if (ooc_message.startsWith("/offset")) {
ui_ooc_chat_message->clear();
ooc_message.remove(0, 8);