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

Merge pull request #578 from AttorneyOnline/fix-desk-mods-again

Browse Source 
Handle expanded desk modifiers on chat ticking start rather than on preanim complete signal
This commit is contained in:
oldmud0 2021-12-22 00:59:48 -06:00 committed by GitHub
commit d9e69cca06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -3290,6 +3290,22 @@ void Courtroom::preanim_done()
if (anim_state != 1 && anim_state != 4 && anim_state != 5)
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]);
@ -3308,19 +3324,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("|");