From ba04c361c6b95e8157dcab990cf32302a7128ab6 Mon Sep 17 00:00:00 2001 From: Misa Date: Sat, 10 Oct 2020 23:32:28 -0700 Subject: [PATCH] Revert "Fix #400" This reverts commit cf5ad166e3ce184fcb808b5a472c958d367b259e. 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. --- desktop_version/src/Music.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 543462d4..8f41a9b3 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -5,7 +5,6 @@ #include #include "BinaryBlob.h" -#include "Game.h" #include "Map.h" #include "UtilityClass.h" @@ -265,11 +264,8 @@ void musicclass::fadeout() 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; - if (!game.musicmuted) Mix_VolumeMusic(musicVolume); + Mix_VolumeMusic(musicVolume); if (musicVolume >= MIX_MAX_VOLUME) { m_doFadeInVol = false;