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

Un-fix using-PPPPPP-while-MMMMMM-present for custom levels

As discussed earlier, some custom levels have taken advantage of the
fact that songs 0 and 7 loop and also fade in when using PPPPPP while
having an mmmmmm.vvv file present.
This commit is contained in:
Misa 2020-04-03 15:37:59 -07:00 committed by Ethan Lee
parent 7b1388f85c
commit e571081f92

View file

@ -2,6 +2,7 @@
#include <stdio.h> #include <stdio.h>
#include "Music.h" #include "Music.h"
#include "BinaryBlob.h" #include "BinaryBlob.h"
#include "Map.h"
void musicclass::init() void musicclass::init()
{ {
@ -237,7 +238,7 @@ void musicclass::play(int t)
{ {
// musicfade = 0; // musicfade = 0;
currentsong = t; currentsong = t;
if (currentsong == 0 || currentsong == 7 || currentsong == 16 || currentsong == 23) if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 16 || currentsong == 23)))
{ {
// Level Complete theme, no fade in or repeat // Level Complete theme, no fade in or repeat
if(Mix_FadeInMusic(musicTracks[t].m_music, 0, 0)==-1) if(Mix_FadeInMusic(musicTracks[t].m_music, 0, 0)==-1)