diff options
| author | sD <stoned@derpymail.org> | 2020-03-13 16:22:41 +0100 |
|---|---|---|
| committer | sD <stoned@derpymail.org> | 2020-03-13 16:22:41 +0100 |
| commit | ba03fb03e238b87dac4720a59bf961a4a13fd869 (patch) | |
| tree | 35f7121d1dfa77038f7015ccb46a7118186c5fab /src/packet_distribution.cpp | |
| parent | 466092b9732feaf59db874dca1895bb7a6e2e2bd (diff) | |
musictime is a bad name for this
Diffstat (limited to 'src/packet_distribution.cpp')
| -rw-r--r-- | src/packet_distribution.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 5e17542d..da59c202 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -411,7 +411,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet) if (!courtroom_constructed) goto end; - bool musics_time = false; + bool musiclist_start = false; int areas = 0; 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))); - if (musics_time) + if (musiclist_start) { 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(".opus")) { - musics_time = true; + musiclist_start = true; areas--; //w_courtroom->fix_last_area(); w_courtroom->append_music(f_music); @@ -514,22 +514,22 @@ void AOApplication::server_packet_received(AOPacket *p_packet) if (!courtroom_constructed) goto end; - bool musics_time = false; + bool musiclist_start = false; area_count = 0; 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(".mp3") || f_contents.at(n_element).endsWith(".mp4") || f_contents.at(n_element).endsWith(".ogg") || f_contents.at(n_element).endsWith(".opus"))) { - musics_time = true; + musiclist_start = true; 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); ++loaded_music; int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size; |