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

Merge pull request #175 from Crystalwarrior/feature/packet-music

Browse Source 
More sensible music loop packet configuration
This commit is contained in:
oldmud0 2020-07-04 12:17:53 -05:00 committed by GitHub
commit 43419933e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/courtroom.cpp
View File

@ -3010,13 +3010,17 @@ void Courtroom::handle_song(QStringList *p_contents)
(f_song_clear.lastIndexOf("/") + 1)); (f_song_clear.lastIndexOf("/") + 1));
int n_char = f_contents.at(1).toInt(); int n_char = f_contents.at(1).toInt();
bool looping = true; //Assume the song doesn't loop unless told otherwise (due to most outdated servers handling looping through serverside)
bool looping = false;
//Channel 0 is the 'master music', other channels would commonly be used for ambience
int channel = 0; int channel = 0;
//No effects assumed by default - vanilla functionality
int effect_flags = 0; int effect_flags = 0;
if (n_char < 0 || n_char >= char_list.size()) { if (n_char < 0 || n_char >= char_list.size()) {
int channel = 0; int channel = 0;
if (p_contents->length() > 3 && p_contents->at(3) != "-1") if (p_contents->length() > 3 && p_contents->at(3) == "1")
looping = false; looping = true;
if (p_contents->length() > if (p_contents->length() >
4) // eyyy we want to change this song's CHANNEL huh 4) // eyyy we want to change this song's CHANNEL huh
@ -3042,10 +3046,8 @@ void Courtroom::handle_song(QStringList *p_contents)
str_show = p_contents->at(2); str_show = p_contents->at(2);
} }
} }
if (p_contents->length() > 3 && p_contents->at(3) != "-1") { if (p_contents->length() > 3 && p_contents->at(3) == "1") {
// I am really confused why "-1" is "loop this song" and why anything else looping = true;
// passes as "don't loop" (if we even have this length) but alright
looping = false;
} }
if (p_contents->length() > if (p_contents->length() >
4) // eyyy we want to change this song's CHANNEL huh 4) // eyyy we want to change this song's CHANNEL huh