Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-02-02 07:23:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix #400

Browse Source
This commit is contained in:
AllyTally
2020-08-01 16:03:41 -03:00
committed by Ethan Lee
parent a4c1ffee12
commit cf5ad166e3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop_version/src/Music.cpp
View File

@@ -4,6 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "BinaryBlob.h" #include "BinaryBlob.h"
#include "Game.h"
#include "Map.h" #include "Map.h"
#include "UtilityClass.h" #include "UtilityClass.h"
@@ -249,8 +250,11 @@ void musicclass::fadeout()
void musicclass::processmusicfadein() void musicclass::processmusicfadein()
{ {
// Instead of returning early if music is muted, this should still increase `musicVolume`
// so that anything that relies on this won't break. We'll simply just not set the volume
// if the music is muted
musicVolume += FadeVolAmountPerFrame; musicVolume += FadeVolAmountPerFrame;
Mix_VolumeMusic(musicVolume); if (!game.musicmuted) Mix_VolumeMusic(musicVolume);
if (musicVolume >= MIX_MAX_VOLUME) if (musicVolume >= MIX_MAX_VOLUME)
{ {
m_doFadeInVol = false; m_doFadeInVol = false;