Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle expanded desk mods on chat ticking start

Browse Source
This commit is contained in:
in1tiate 2021-08-01 11:13:52 -05:00
parent 579456fbd7
commit 6bbb45a6d1
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/courtroom.cpp
View File

@ -3284,6 +3284,22 @@ void Courtroom::preanim_done()
if (anim_state != 1 && anim_state != 4) if (anim_state != 1 && anim_state != 4)
return; return;
anim_state = 1; 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()) { switch(m_chatmessage[DESK_MOD].toInt()) {
case 4: case 4:
set_self_offset(m_chatmessage[SELF_OFFSET]); set_self_offset(m_chatmessage[SELF_OFFSET]);
@ -3302,19 +3318,6 @@ void Courtroom::preanim_done()
set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]); set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);
break; 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] != "") { if (m_chatmessage[EFFECTS] != "") {
QStringList fx_list = m_chatmessage[EFFECTS].split("|"); QStringList fx_list = m_chatmessage[EFFECTS].split("|");