From 6844f72ab5184bcfee763bfe80baf1ee387a5811 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Wed, 29 Jul 2020 18:31:15 -0500 Subject: [PATCH] Fix build error from bad merge redefinition of objection_mod --- src/courtroom.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index d8a18ce..f16d9a9 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1864,7 +1864,6 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) append_ic_text(m_chatmessage[MESSAGE], f_showname, "", m_chatmessage[TEXT_COLOR].toInt()); - int objection_mod = m_chatmessage[OBJECTION_MOD].toInt(); QString f_char = m_chatmessage[CHAR_NAME]; QString f_custom_theme = ao_app->get_char_shouts(f_char);