aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorin1tiate <32779090+in1tiate@users.noreply.github.com>2020-09-19 04:12:40 -0500
committerin1tiate <32779090+in1tiate@users.noreply.github.com>2020-09-19 04:12:40 -0500
commit48f8d8aa27ee08697d0f186a0ff6df9f244f7c53 (patch)
tree1adc6da14eb5292aaa5c5fbddc7f7b68a143d864 /src
parentaa6f073ea87c5537b35f00293766dcdd74da63a1 (diff)
add variable check for evidence presenting
Diffstat (limited to 'src')
-rw-r--r--src/courtroom.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index e8d32623..d36343bb 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1763,6 +1763,7 @@ void Courtroom::reset_ic()
ui_vp_chat_arrow->stop();
text_state = 0;
anim_state = 0;
+ evidence_presented = false;
ui_vp_objection->stop();
chat_tick_timer->stop();
ui_vp_evidence_display->reset();
@@ -2255,7 +2256,8 @@ void Courtroom::handle_chatmessage_3()
.isEmpty()) // Pure whitespace showname, get outta here.
f_showname = m_chatmessage[CHAR_NAME];
- if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) {
+ if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size() &&
+ !evidence_presented) {
// shifted by 1 because 0 is no evidence per legacy standards
QString f_image = local_evidence_list.at(f_evi_id - 1).image;
QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name;
@@ -2269,6 +2271,8 @@ void Courtroom::handle_chatmessage_3()
tr("has presented evidence"),
m_chatmessage[TEXT_COLOR].toInt());
append_ic_text(f_evi_name, f_showname, tr("has presented evidence"));
+ evidence_presented = true; // we're done presenting evidence, and we
+ // don't want to do it twice
}
int emote_mod = m_chatmessage[EMOTE_MOD].toInt();