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

Merge pull request #104 from Crystalwarrior/music_list_update

Browse Source 
Allow servers to send area list and music list refresh requests
This commit is contained in:
stonedDiscord 2020-03-15 17:06:22 +01:00 committed by GitHub
commit ac31da6b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/courtroom.h
View File

@ -77,6 +77,8 @@ public:
void append_evidence(evi_type p_evi){evidence_list.append(p_evi);} void append_evidence(evi_type p_evi){evidence_list.append(p_evi);}
void append_music(QString f_music){music_list.append(f_music);} void append_music(QString f_music){music_list.append(f_music);}
void append_area(QString f_area){area_list.append(f_area);} void append_area(QString f_area){area_list.append(f_area);}
void clear_music(){music_list.clear();}
void clear_areas(){area_list.clear();}
void handle_failed_login(); void handle_failed_login();
QString threading_sfx = ""; QString threading_sfx = "";
QString threading_shake = ""; QString threading_shake = "";

6
src/courtroom.cpp
View File

@ -1108,9 +1108,9 @@ void Courtroom::list_areas()
for (int n_area = 0 ; n_area < area_list.size() ; ++n_area) for (int n_area = 0 ; n_area < area_list.size() ; ++n_area)
{ {
QString i_area = ""; QString i_area = "";
i_area.append("["); // i_area.append("[");
i_area.append(QString::number(n_area)); // i_area.append(QString::number(n_area));
i_area.append("] "); // i_area.append("] ");
i_area.append(area_list.at(n_area)); i_area.append(area_list.at(n_area));

9
src/packet_distribution.cpp
View File

@ -515,11 +515,14 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
send_server_packet(new AOPacket("RM#%")); send_server_packet(new AOPacket("RM#%"));
} }
else if (header == "SM") else if (header == "SM" || header == "FM")
{ {
if (!courtroom_constructed) if (!courtroom_constructed)
goto end; goto end;
w_courtroom->clear_music();
w_courtroom->clear_areas();
bool musiclist_start = false; bool musiclist_start = false;
area_count = 0; area_count = 0;
@ -543,8 +546,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
} }
QThreadPool::globalInstance()->waitForDone(); QThreadPool::globalInstance()->waitForDone();
if (header == "SM")
send_server_packet(new AOPacket("RD#%")); send_server_packet(new AOPacket("RD#%"));
} }
else if (header == "DONE") else if (header == "DONE")
{ {