diff options
| author | in1tiate <radwoodward@vikings.grayson.edu> | 2021-08-01 11:13:52 -0500 |
|---|---|---|
| committer | in1tiate <radwoodward@vikings.grayson.edu> | 2021-08-01 11:13:52 -0500 |
| commit | 6bbb45a6d14fa8ff18cf4b145a8b2bb76ca6bdc2 (patch) | |
| tree | 8a380cadf444f96b4f8bddabdf9738c8e9353916 | |
| parent | 579456fbd766b64f4ba11b9ff83ece3dad9d6553 (diff) | |
handle expanded desk mods on chat ticking start
| -rw-r--r-- | src/courtroom.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 25f256ae..1fb8ce09 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3284,6 +3284,22 @@ void Courtroom::preanim_done() if (anim_state != 1 && anim_state != 4) return; anim_state = 1; + + handle_ic_speaking(); +} + +void Courtroom::start_chat_ticking() +{ + text_delay_timer->stop(); + // we need to ensure that the text isn't already ticking because this function + // can be called by two logic paths + if (text_state != 0) + return; + + // Display the evidence + display_evidence_image(); + + // handle expanded desk mods switch(m_chatmessage[DESK_MOD].toInt()) { case 4: set_self_offset(m_chatmessage[SELF_OFFSET]); @@ -3302,19 +3318,6 @@ void Courtroom::preanim_done() set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]); break; } - handle_ic_speaking(); -} - -void Courtroom::start_chat_ticking() -{ - text_delay_timer->stop(); - // we need to ensure that the text isn't already ticking because this function - // can be called by two logic paths - if (text_state != 0) - return; - - // Display the evidence - display_evidence_image(); if (m_chatmessage[EFFECTS] != "") { QStringList fx_list = m_chatmessage[EFFECTS].split("|"); |
