mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Fix whitespace inconsistency in musicclass::play()
Spaces are used around operators and keywords accordingly, and blank lines are used to visually separate lines of code from each other.
This commit is contained in:
parent
ff3e390352
commit
96c479a11f
1 changed files with 9 additions and 4 deletions
|
@ -184,19 +184,23 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade
|
||||||
{
|
{
|
||||||
t += num_mmmmmm_tracks;
|
t += num_mmmmmm_tracks;
|
||||||
}
|
}
|
||||||
|
|
||||||
safeToProcessMusic = true;
|
safeToProcessMusic = true;
|
||||||
musicVolume = MIX_MAX_VOLUME;
|
musicVolume = MIX_MAX_VOLUME;
|
||||||
|
|
||||||
if (currentsong != t)
|
if (currentsong != t)
|
||||||
{
|
{
|
||||||
if (t != -1)
|
if (t != -1)
|
||||||
{
|
{
|
||||||
currentsong = t;
|
currentsong = t;
|
||||||
|
|
||||||
if (!INBOUNDS_VEC(t, musicTracks))
|
if (!INBOUNDS_VEC(t, musicTracks))
|
||||||
{
|
{
|
||||||
puts("play() out-of-bounds!");
|
puts("play() out-of-bounds!");
|
||||||
currentsong = -1;
|
currentsong = -1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 0+num_mmmmmm_tracks || currentsong == 7+num_mmmmmm_tracks)))
|
if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 0+num_mmmmmm_tracks || currentsong == 7+num_mmmmmm_tracks)))
|
||||||
{
|
{
|
||||||
// Level Complete theme, no fade in or repeat
|
// Level Complete theme, no fade in or repeat
|
||||||
|
@ -213,6 +217,7 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade
|
||||||
nicechange = t;
|
nicechange = t;
|
||||||
nicefade = true;
|
nicefade = true;
|
||||||
currentsong = -1;
|
currentsong = -1;
|
||||||
|
|
||||||
if (quick_fade)
|
if (quick_fade)
|
||||||
{
|
{
|
||||||
Mix_FadeOutMusic(500); // fade out quicker
|
Mix_FadeOutMusic(500); // fade out quicker
|
||||||
|
|
Loading…
Reference in a new issue