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

Merge pull request #503 from AttorneyOnline/fix/skip-queue

Browse Source 
Fix chat queue being cleared with no way to see what the msgs were
This commit is contained in:
oldmud0 2021-03-21 22:42:18 -05:00 committed by GitHub
commit e9eba9b5ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 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,

21
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,19 @@ 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();
log_chatmessage(p_contents[MESSAGE], p_contents[CHAR_ID].toInt(), p_contents[SHOWNAME], p_contents[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) {