aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwindrammer <31085911+likeawindrammer@users.noreply.github.com>2020-07-29 11:15:30 -0600
committerGitHub <noreply@github.com>2020-07-29 12:15:30 -0500
commita640def15718fd4eae5a4dd4364eaa559358e973 (patch)
tree1d7856b2b22c8ca34be10c5836facebf0ef40662
parent2935d24a07a5ae9b15e47a8d390e1353af986424 (diff)
Fix screenshake button shunting character to origin (#215)
* Fix #193 By making sure handle_chatmessage_3 calls start_chat_ticking and thus do_screenshake only after either play_idle or play_talking is called * Move call to start_chat_ticking to the end of handle_chatmessage_3
-rw-r--r--src/courtroom.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 109c3479..5d38f8bc 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2154,8 +2154,6 @@ void Courtroom::play_char_sfx(QString sfx_name)
void Courtroom::handle_chatmessage_3()
{
- start_chat_ticking();
-
int f_evi_id = m_chatmessage[EVIDENCE_ID].toInt();
QString f_side = m_chatmessage[SIDE];
@@ -2235,6 +2233,8 @@ void Courtroom::handle_chatmessage_3()
break;
}
}
+
+ start_chat_ticking();
}
QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos,