From 22738cdb970dbf023e306ebedfaca2220192f638 Mon Sep 17 00:00:00 2001 From: Misa Date: Sat, 27 Jun 2020 01:40:58 -0700 Subject: [PATCH] Remove unused/useless vars music.custompd/musicfade(in)/volume I have no idea why these are here, but it'll simplify readability and reduce the chance of confusion if I remove them. --- desktop_version/src/Music.cpp | 5 ----- desktop_version/src/Music.h | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 6a17b1b7..511a23ce 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -218,15 +218,10 @@ void musicclass::init() musicVolume = 128; FadeVolAmountPerFrame = 0; - custompd = false; - currentsong = 0; - musicfade = 0; - musicfadein = 0; nicechange = 0; nicefade = 0; resumesong = 0; - volume = 0.0f; fadeoutqueuesong = -1; dontquickfade = false; diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h index d681f61c..b3b1eeab 100644 --- a/desktop_version/src/Music.h +++ b/desktop_version/src/Music.h @@ -26,7 +26,7 @@ public: void changemusicarea(int x, int y); - int currentsong, musicfade, musicfadein; + int currentsong; int resumesong; void playef(int t); @@ -43,10 +43,6 @@ public: int FadeVolAmountPerFrame; int musicVolume; - float volume; - - bool custompd; - int fadeoutqueuesong; // -1 if no song queued bool dontquickfade;