mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Change nicefade to bool instead of int

Browse source 
If it's treated like a bool, why shouldn't it be one?
This commit is contained in:
Misa 2020-11-06 00:20:58 -08:00 committed by Ethan Lee
parent f0b9bdc007
commit c1ca57e096
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/Game.cpp
View file

@ -5925,7 +5925,7 @@ std::string Game::writemaingamesave(tinyxml2::XMLDocument& doc)
//Special stats //Special stats
if(music.nicefade==1) if (music.nicefade)
{ {
xml::update_tag(msgs, "currentsong", music.nicechange); xml::update_tag(msgs, "currentsong", music.nicechange);
} }
@ -6058,7 +6058,7 @@ bool Game::customsavequick(std::string savfile)
//Special stats //Special stats
if(music.nicefade==1) if (music.nicefade)
{ {
xml::update_tag(msgs, "currentsong", music.nicechange ); xml::update_tag(msgs, "currentsong", music.nicechange );
} }

9
desktop_version/src/Music.cpp
View file

@ -137,7 +137,7 @@ void musicclass::init()
currentsong = 0; currentsong = 0;
nicechange = 0; nicechange = 0;
nicefade = 0; nicefade = false;
resumesong = 0; resumesong = 0;
fadeoutqueuesong = -1; fadeoutqueuesong = -1;
dontquickfade = false; dontquickfade = false;
@ -282,10 +282,11 @@ void musicclass::processmusic()
fadeoutqueuesong = -1; fadeoutqueuesong = -1;
} }
if (nicefade == 1 && Mix_PlayingMusic() == 0) if (nicefade && Mix_PlayingMusic() == 0)
{ {
play(nicechange); play(nicechange);
nicechange = -1; nicefade = 0; nicechange = -1;
nicefade = false;
} }
if(m_doFadeInVol) if(m_doFadeInVol)
@ -305,7 +306,7 @@ void musicclass::niceplay(int t)
dontquickfade = true; dontquickfade = true;
fadeout(); fadeout();
} }
nicefade = 1; nicefade = true;
nicechange = t; nicechange = t;
} }
} }

2
desktop_version/src/Music.h
View file

@ -37,7 +37,7 @@ public:
bool safeToProcessMusic; bool safeToProcessMusic;
int nicechange; int nicechange;
int nicefade; bool nicefade;
bool m_doFadeInVol; bool m_doFadeInVol;
int FadeVolAmountPerFrame; int FadeVolAmountPerFrame;