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

fix first-person / narrator mode

Browse Source
This commit is contained in:
in1tiate 2024-05-26 13:39:14 -05:00
parent b9df908113
commit f09ff7fc51
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/courtroom.cpp
View File

@ -2910,8 +2910,15 @@ void Courtroom::handle_ic_message()
{ {
// Update the chatbox information // Update the chatbox information
initialize_chatbox(); initialize_chatbox();
if (m_chatmessage[EMOTE] != "")
do_transition(m_chatmessage[DESK_MOD], last_side, m_chatmessage[SIDE]); {
do_transition(m_chatmessage[DESK_MOD], last_side, m_chatmessage[SIDE]);
}
else
{
play_sfx();
start_chat_ticking();
}
// if we have instant objections disabled, and queue is not empty, check if next message after this is an objection. // if we have instant objections disabled, and queue is not empty, check if next message after this is an objection.
if (!Options::getInstance().objectionSkipQueueEnabled() && chatmessage_queue.size() > 0) if (!Options::getInstance().objectionSkipQueueEnabled() && chatmessage_queue.size() > 0)
@ -2974,10 +2981,7 @@ void Courtroom::do_screenshake()
void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newPosId) void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newPosId)
{ {
if (m_chatmessage[EMOTE].isEmpty()) display_character();
{
display_character();
}
const QStringList legacy_pos = {"def", "wit", "pro"}; const QStringList legacy_pos = {"def", "wit", "pro"};
QString t_old_pos = oldPosId; QString t_old_pos = oldPosId;
@ -3000,7 +3004,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP
int duration = ao_app->get_pos_transition_duration(t_old_pos, t_new_pos); int duration = ao_app->get_pos_transition_duration(t_old_pos, t_new_pos);
// conditions to stop slide // conditions to stop slide
if (m_chatmessage[EMOTE].isEmpty() || oldPosId == newPosId || old_pos_pair.first != new_pos_pair.first || !new_pos_pair.second.isValid() || !Options::getInstance().slidesEnabled() || m_chatmessage[SLIDE] != "1" || duration == -1 || m_chatmessage[EMOTE_MOD].toInt() == ZOOM || m_chatmessage[EMOTE_MOD].toInt() == PREANIM_ZOOM) if (oldPosId == newPosId || old_pos_pair.first != new_pos_pair.first || !new_pos_pair.second.isValid() || !Options::getInstance().slidesEnabled() || m_chatmessage[SLIDE] != "1" || duration == -1 || m_chatmessage[EMOTE_MOD].toInt() == ZOOM || m_chatmessage[EMOTE_MOD].toInt() == PREANIM_ZOOM)
{ {
#ifdef DEBUG_TRANSITION #ifdef DEBUG_TRANSITION
qDebug() << "skipping transition - not applicable"; qDebug() << "skipping transition - not applicable";