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

move area list detection algorithm into a seperate function

Browse Source
This commit is contained in:
sD 2020-03-13 16:29:01 +01:00
parent ba03fb03e2
commit 1b0930b977
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aoapplication.h
View File

@ -58,6 +58,8 @@ public:
void construct_courtroom(); void construct_courtroom();
void destruct_courtroom(); void destruct_courtroom();
bool is_music_track(QString trackname);
void ms_packet_received(AOPacket *p_packet); void ms_packet_received(AOPacket *p_packet);
void server_packet_received(AOPacket *p_packet); void server_packet_received(AOPacket *p_packet);

23
src/packet_distribution.cpp
View File

@ -151,6 +151,16 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
delete p_packet; delete p_packet;
} }
bool AOApplication::is_music_track(QString trackname)
{
return (trackname.startsWith("==") ||
trackname.endsWith(".wav") ||
trackname.endsWith(".mp3") ||
trackname.endsWith(".mp4") ||
trackname.endsWith(".ogg") ||
trackname.endsWith(".opus"));
}
void AOApplication::server_packet_received(AOPacket *p_packet) void AOApplication::server_packet_received(AOPacket *p_packet)
{ {
p_packet->net_decode(); p_packet->net_decode();
@ -434,11 +444,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
else else
{ {
if (f_music.endsWith(".wav") || if (is_music_track(f_music))
f_music.endsWith(".mp3") ||
f_music.endsWith(".mp4") ||
f_music.endsWith(".ogg") ||
f_music.endsWith(".opus"))
{ {
musiclist_start = true; musiclist_start = true;
areas--; areas--;
@ -519,12 +525,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element) for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element)
{ {
if (!musiclist_start && (f_contents.at(n_element).startsWith("==") || if (!musiclist_start && is_music_track(f_contents.at(n_element)))
f_contents.at(n_element).endsWith(".wav") ||
f_contents.at(n_element).endsWith(".mp3") ||
f_contents.at(n_element).endsWith(".mp4") ||
f_contents.at(n_element).endsWith(".ogg") ||
f_contents.at(n_element).endsWith(".opus")))
{ {
musiclist_start = true; musiclist_start = true;
continue; continue;