diff options
| author | cents <sens03.con@gmail.com> | 2020-05-23 10:41:20 -0700 |
|---|---|---|
| committer | cents <sens03.con@gmail.com> | 2020-05-23 10:41:20 -0700 |
| commit | c83fd9f7323464493b76af915e974c1dc2262686 (patch) | |
| tree | c2e0fa10c2d3d70b7098deee2634fa577383aec8 /src | |
| parent | 53c72227c4ade7c3e28bf0051346d297f56e51be (diff) | |
Added backwards compatibility for the music list
Diffstat (limited to 'src')
| -rw-r--r-- | src/packet_distribution.cpp | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index a110ec4b..36593d6e 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -478,19 +478,39 @@ void AOApplication::server_packet_received(AOPacket *p_packet) bool musics_time = false;
area_count = 0;
-
+ bool legacy_system = false;
+ int element_ahead = 0;
for (int n_element = 0; n_element < f_contents.size(); ++n_element) {
- int element2check = n_element + 1;
- if (element2check > f_contents.size()) {
- element2check = n_element; // I know this is very lazy code but cba
+ element_ahead = n_element + 1;
+ if (!musics_time && f_contents.at(n_element).startsWith("==") && (
+ f_contents.at(element_ahead).endsWith(".wav") ||
+ f_contents.at(element_ahead).endsWith(".mp3") ||
+ f_contents.at(element_ahead).endsWith(".mp4") ||
+ f_contents.at(element_ahead).endsWith(".ogg") ||
+ f_contents.at(element_ahead).endsWith(".opus"))) {
+ legacy_system = true;
+
+ }
+ if(!legacy_system) {
+ if (!musics_time && (f_contents.at(n_element).startsWith("==") ||
+ f_contents.at(element_ahead).endsWith(".wav") ||
+ f_contents.at(element_ahead).endsWith(".mp3") ||
+ f_contents.at(element_ahead).endsWith(".mp4") ||
+ f_contents.at(element_ahead).endsWith(".ogg") ||
+ f_contents.at(element_ahead).endsWith(".opus"))) {
+ musics_time = true;
}
- if (!musics_time && (f_contents.at(n_element).startsWith("==") ||
- f_contents.at(element2check).endsWith(".wav") ||
- f_contents.at(element2check).endsWith(".mp3") ||
- f_contents.at(element2check).endsWith(".mp4") ||
- f_contents.at(element2check).endsWith(".ogg") ||
- f_contents.at(element2check).endsWith(".opus"))) {
- musics_time = true;
+ }
+ else{
+ if (!musics_time && (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;
+ }
+
}
// Not everything needs to have a thread.
|