Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash from old music packets

Browse Source
This commit is contained in:
scatterflower 2021-03-13 03:17:46 -06:00
parent 7a64521c40
commit 18f76d68ea
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/packets.cpp
View File

@ -210,9 +210,14 @@ void AOClient::pktChangeMusic(AreaData* area, int argc, QStringList argv, AOPack
for (QString song : server->music_list) { for (QString song : server->music_list) {
if (song == argument || song == "~stop.mp3") { // ~stop.mp3 is a dummy track used by 2.9+ if (song == argument || song == "~stop.mp3") { // ~stop.mp3 is a dummy track used by 2.9+
// We have a song here // We have a song here
AOPacket music_change("MC", {song, argv[1], argv[2], "1", "0", argv[3]}); QString effects;
if (argc >= 4)
effects = argv[3];
else
effects = "0";
AOPacket music_change("MC", {song, argv[1], showname, "1", "0", effects});
area->current_music = song; area->current_music = song;
area->music_played_by = argv[2]; area->music_played_by = showname;
server->broadcast(music_change, current_area); server->broadcast(music_change, current_area);
return; return;
} }