mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-03 15:39:46 +01:00
Code Issues Releases Wiki Activity

Revert "Fix #400"

Browse source 
This reverts commit cf5ad166e3.

My implementation will make it so single-case patches like this commit
won't be necessary anymore (there's no need to add a special-case check
for game.musicmuted, the way that I'm gonna do it). In fact, it's better
if I just revert the commit entirely.
This commit is contained in:
Misa 2020-10-10 23:32:28 -07:00 committed by Ethan Lee
parent 7b7c7b2dc7
commit ba04c361c6
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/src/Music.cpp
View file

@ -5,7 +5,6 @@
#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"
@ -265,11 +264,8 @@ 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;
if (!game.musicmuted) Mix_VolumeMusic(musicVolume); Mix_VolumeMusic(musicVolume);
if (musicVolume >= MIX_MAX_VOLUME) if (musicVolume >= MIX_MAX_VOLUME)
{ {
m_doFadeInVol = false; m_doFadeInVol = false;