aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscatterflower <marisaposs@gameboyprinter.moe>2020-08-16 07:06:53 -0500
committerscatterflower <marisaposs@gameboyprinter.moe>2020-08-16 07:06:53 -0500
commit079ce93b85ecc25e338d61614318fb6ed6cce696 (patch)
treed02f604c608e77a9142940bd94b1c93bf2a45a52
parent11250e13864dc5e3cdd799b02498905c58db55ea (diff)
Remove clientside doublepost checking
-rw-r--r--src/courtroom.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 5f7a6134..f26645ff 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1792,9 +1792,11 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
QString f_displayname;
if (!is_spectator && (m_chatmessage[SHOWNAME].isEmpty() || !ui_showname_enable->isChecked())) {
+ // If the users is not a spectator and showname is disabled, use the character's name
f_displayname = ao_app->get_showname(char_list.at(f_char_id).name);
}
else {
+ // Otherwise, use the showname
f_displayname = m_chatmessage[SHOWNAME];
}
@@ -1803,20 +1805,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
f_displayname = ao_app->get_showname(char_list.at(f_char_id).name);
QString f_message = f_displayname + ": " + m_chatmessage[MESSAGE] + '\n';
- // Remove undesired newline chars
- m_chatmessage[MESSAGE].remove("\n");
- chatmessage_is_empty =
- m_chatmessage[MESSAGE] == " " || m_chatmessage[MESSAGE] == "";
- if (f_char_id >= 0 && !chatmessage_is_empty &&
- f_message == previous_ic_message) // Not a system message
- return;
-
- if (f_char_id <= -1)
- previous_ic_message =
- ""; // System messages don't care about repeating themselves
- else
- previous_ic_message = f_message;
bool ok;
int objection_mod = m_chatmessage[OBJECTION_MOD].toInt(
&ok, 10); // checks if its a custom obj.