diff options
| author | Cerapter <cerap@protonmail.com> | 2018-10-23 09:51:53 +0200 |
|---|---|---|
| committer | Cerapter <cerap@protonmail.com> | 2018-10-23 09:51:53 +0200 |
| commit | 3f41ed134121bfcf6e1bbbbac9fcd1aad49fbd6b (patch) | |
| tree | 382d7f168c38eb4f8e4a36c64d6d59e1e2486bc4 /courtroom.cpp | |
| parent | 546d3c897031d2b6f1c36c4b9cd94e3b9e0e62b9 (diff) | |
Fixed the fullstop-silence bug.
Made it so that characters correctly switch to-and-fro idle / talking
anims during full stops, and don't interrupt non-interrupting pres.
Diffstat (limited to 'courtroom.cpp')
| -rw-r--r-- | courtroom.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/courtroom.cpp b/courtroom.cpp index 2d5468e4..bd206cf4 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -2297,7 +2297,7 @@ void Courtroom::chat_tick() // Silencing the character during long times of ellipses. else if (f_character == "." and !next_character_is_not_special and !previous_character_is_fullstop) { - if (!previous_character_is_fullstop && inline_blue_depth == 0 && !entire_message_is_blue) + if (!previous_character_is_fullstop && inline_blue_depth == 0 && !entire_message_is_blue && anim_state != 4) { QString f_char = m_chatmessage[CHAR_NAME]; QString f_emote = m_chatmessage[EMOTE]; @@ -2352,8 +2352,9 @@ void Courtroom::chat_tick() // - But the previous character was // - And we're out of inline blues // - And the entire messages isn't blue + // - And we aren't still in a non-interrupting pre // - And this isn't the last character. - if (f_character != "." && previous_character_is_fullstop && inline_blue_depth == 0 && !entire_message_is_blue && tick_pos+1 >= f_message.size()) + if (f_character != "." && previous_character_is_fullstop && inline_blue_depth == 0 && !entire_message_is_blue && anim_state != 4 && tick_pos+1 <= f_message.size()) { QString f_char = m_chatmessage[CHAR_NAME]; QString f_emote = m_chatmessage[EMOTE]; |