mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Fixed some music bugs

Browse source 
Previously, when MMMMMM is installed but the user is using PPPPPP, niceplay would still restart the song even if it's the same. That has been fixed. In addition, Plenary and Path Complete no longer loop when MMMMMM is installed but PPPPPP is in use.
This commit is contained in:
Stelpjo 2020-02-12 16:00:54 -05:00 committed by Ethan Lee
parent df1c1303bf
commit c665d5b8c8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/Music.cpp
View file

@ -246,7 +246,7 @@ void musicclass::play(int t)
{ {
// musicfade = 0; // musicfade = 0;
currentsong = t; currentsong = t;
if (currentsong == 0 || currentsong == 7) if (currentsong == 0 || currentsong == 7 || currentsong == 16 || currentsong == 23)
{ {
// Level Complete theme, no fade in or repeat // Level Complete theme, no fade in or repeat
// musicchannel = musicchan[currentsong].play(0); // musicchannel = musicchan[currentsong].play(0);
@ -412,7 +412,7 @@ void musicclass::processmusic()
void musicclass::niceplay(int t) void musicclass::niceplay(int t)
{ {
// important: do nothing if the correct song is playing! // important: do nothing if the correct song is playing!
if(currentsong!=t) if((!mmmmmm && currentsong!=t) || (mmmmmm && usingmmmmmm && currentsong!=t) || (mmmmmm && !usingmmmmmm && currentsong!=t+16))
{ {
if(currentsong!=-1) if(currentsong!=-1)
{ {