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

Merge pull request #255 from scatterflower/2.8

Browse Source 
Do not update colors in log for each IC message
This commit is contained in:
scatterflower 2020-08-17 13:11:21 -05:00 committed by GitHub
commit 3c13a686a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/courtroom.cpp
View File

@ -1885,14 +1885,6 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
QString f_char = m_chatmessage[CHAR_NAME]; QString f_char = m_chatmessage[CHAR_NAME];
QString f_custom_theme = ao_app->get_char_shouts(f_char); QString f_custom_theme = ao_app->get_char_shouts(f_char);
// Load the colors in case it's using a custom chatbox with custom colors.
// Or reload the default ones in case it's not using custom colors
color_rgb_list.clear();
for (int c = 0; c < max_colors; ++c) {
QColor color = ao_app->get_chat_color("c" + QString::number(c), f_char);
color_rgb_list.append(color);
}
append_ic_text(m_chatmessage[MESSAGE], f_displayname, "", append_ic_text(m_chatmessage[MESSAGE], f_displayname, "",
m_chatmessage[TEXT_COLOR].toInt()); m_chatmessage[TEXT_COLOR].toInt());
@ -1927,8 +1919,8 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
shout_stay_time); shout_stay_time);
objection_player->play("custom", f_char, f_custom_theme); objection_player->play("custom", f_char, f_custom_theme);
} }
break;
m_chatmessage[EMOTE_MOD] = 1; m_chatmessage[EMOTE_MOD] = 1;
break;
} }
sfx_player->clear(); // Objection played! Cut all sfx. sfx_player->clear(); // Objection played! Cut all sfx.
} }