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

musictime is a bad name for this

Browse Source
This commit is contained in:
sD 2020-03-13 16:22:41 +01:00
parent 466092b973
commit ba03fb03e2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/packet_distribution.cpp
View File

@ -411,7 +411,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
if (!courtroom_constructed) if (!courtroom_constructed)
goto end; goto end;
bool musics_time = false; bool musiclist_start = false;
int areas = 0; int areas = 0;
for (int n_element = 0 ; n_element < f_contents.size() ; n_element += 2) for (int n_element = 0 ; n_element < f_contents.size() ; n_element += 2)
@ -428,7 +428,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
w_lobby->set_loading_text(tr("Loading music:\n%1/%2").arg(QString::number(loaded_music)).arg(QString::number(music_list_size))); w_lobby->set_loading_text(tr("Loading music:\n%1/%2").arg(QString::number(loaded_music)).arg(QString::number(music_list_size)));
if (musics_time) if (musiclist_start)
{ {
w_courtroom->append_music(f_music); w_courtroom->append_music(f_music);
} }
@ -440,7 +440,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
f_music.endsWith(".ogg") || f_music.endsWith(".ogg") ||
f_music.endsWith(".opus")) f_music.endsWith(".opus"))
{ {
musics_time = true; musiclist_start = true;
areas--; areas--;
//w_courtroom->fix_last_area(); //w_courtroom->fix_last_area();
w_courtroom->append_music(f_music); w_courtroom->append_music(f_music);
@ -514,22 +514,22 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
if (!courtroom_constructed) if (!courtroom_constructed)
goto end; goto end;
bool musics_time = false; bool musiclist_start = false;
area_count = 0; area_count = 0;
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 (!musics_time && (f_contents.at(n_element).startsWith("==") || if (!musiclist_start && (f_contents.at(n_element).startsWith("==") ||
f_contents.at(n_element).endsWith(".wav") || f_contents.at(n_element).endsWith(".wav") ||
f_contents.at(n_element).endsWith(".mp3") || f_contents.at(n_element).endsWith(".mp3") ||
f_contents.at(n_element).endsWith(".mp4") || f_contents.at(n_element).endsWith(".mp4") ||
f_contents.at(n_element).endsWith(".ogg") || f_contents.at(n_element).endsWith(".ogg") ||
f_contents.at(n_element).endsWith(".opus"))) f_contents.at(n_element).endsWith(".opus")))
{ {
musics_time = true; musiclist_start = true;
continue; continue;
} }
AOPacketLoadMusicThreading *music_load = new AOPacketLoadMusicThreading(this, f_contents.at(n_element), musics_time); AOPacketLoadMusicThreading *music_load = new AOPacketLoadMusicThreading(this, f_contents.at(n_element), musiclist_start);
QThreadPool::globalInstance()->start(music_load); QThreadPool::globalInstance()->start(music_load);
++loaded_music; ++loaded_music;
int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size; int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size;