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

Add explanation comments to the music looping vars

Browse Source 
Make music not loop by default for backwards compatibility with old style on servers not supporting clientside music looping
Make the music loop when the packet containing loop data gives us "1", treating it as "looping=true".
This commit is contained in:
Crystalwarrior 2020-06-30 23:29:51 +03:00
parent 19d0c29b35
commit 6d4eb87749
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

@ -3000,13 +3000,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
@ -3032,10 +3036,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