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

Merge pull request #589 from Salanto/remove-/pair-ooc_command

Browse Source 
Remove /pair as a client-side command
This commit is contained in:
oldmud0 2021-09-17 22:09:22 -05:00 committed by GitHub
commit 15c2aa32e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/courtroom.cpp
View File

@ -4010,52 +4010,6 @@ void Courtroom::on_ooc_return_pressed()
"1"); "1");
return; 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")) { else if (ooc_message.startsWith("/offset")) {
ui_ooc_chat_message->clear(); ui_ooc_chat_message->clear();
ooc_message.remove(0, 8); ooc_message.remove(0, 8);