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

Fix chat messages being lost to the Ether if instant objection was used, or you switched an area during queue being parsed. (Your IC logs will be caught up to speed instead)

Browse Source
This commit is contained in:
Crystalwarrior 2021-03-22 02:10:06 +03:00
parent bddf6c67c2
commit 702b275898
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/courtroom.h
View File

@ -226,6 +226,9 @@ public:
// Parse the chat message packet and unpack it into the m_chatmessage[ITEM] format // Parse the chat message packet and unpack it into the m_chatmessage[ITEM] format
void unpack_chatmessage(QStringList p_contents); void unpack_chatmessage(QStringList p_contents);
// Skip the current queue, adding all the queue messages to the logs if desynchronized logs are disabled
void skip_chatmessage_queue();
enum LogMode { enum LogMode {
IO_ONLY, IO_ONLY,
DISPLAY_ONLY, DISPLAY_ONLY,

36
src/courtroom.cpp
View File

@ -1247,7 +1247,7 @@ void Courtroom::set_background(QString p_background, bool display)
// Clear the message queue // Clear the message queue
text_queue_timer->stop(); text_queue_timer->stop();
chatmessage_queue.clear(); skip_chatmessage_queue();
text_state = 2; text_state = 2;
anim_state = 3; anim_state = 3;
@ -1961,8 +1961,10 @@ void Courtroom::chatmessage_enqueue(QStringList p_contents)
int objection_mod = p_contents[OBJECTION_MOD].split("&")[0].toInt(); int objection_mod = p_contents[OBJECTION_MOD].split("&")[0].toInt();
is_objection = objection_mod >= 1 && objection_mod <= 5; is_objection = objection_mod >= 1 && objection_mod <= 5;
// If this is an objection, nuke the queue // If this is an objection, nuke the queue
if (is_objection) if (is_objection) {
chatmessage_queue.clear(); text_queue_timer->stop();
skip_chatmessage_queue();
}
} }
// Record the log I/O, log files should be accurate. // Record the log I/O, log files should be accurate.
@ -2008,6 +2010,34 @@ void Courtroom::chatmessage_dequeue()
unpack_chatmessage(chatmessage_queue.dequeue()); unpack_chatmessage(chatmessage_queue.dequeue());
} }
void Courtroom::skip_chatmessage_queue()
{
if (ao_app->is_desyncrhonized_logs_enabled()) {
chatmessage_queue.clear();
return;
}
while (!chatmessage_queue.isEmpty()) {
QStringList p_contents = chatmessage_queue.dequeue();
for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) {
// Note that we have added stuff that vanilla clients and servers simply
// won't send. So now, we have to check if the thing we want even exists
// amongst the packet's content. We also have to check if the server even
// supports CCCC's IC features, or if it's just japing us. Also, don't
// forget! A size 15 message will have indices from 0 to 14.
if (n_string < p_contents.size() &&
(n_string < MS_MINIMUM || ao_app->cccc_ic_support_enabled)) {
m_chatmessage[n_string] = p_contents.at(n_string);
}
else {
m_chatmessage[n_string] = "";
}
// We have logs displaying as soon as we reach the message in our queue, which is a less confusing but also less accurate experience for the user.
log_chatmessage(m_chatmessage[MESSAGE], m_chatmessage[CHAR_ID].toInt(), m_chatmessage[SHOWNAME], m_chatmessage[TEXT_COLOR].toInt(), DISPLAY_ONLY);
}
}
}
void Courtroom::unpack_chatmessage(QStringList p_contents) void Courtroom::unpack_chatmessage(QStringList p_contents)
{ {
for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) { for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) {