From 96c479a11fa4d7e72c029b54a5193cd4f4069f78 Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 3 Jan 2021 23:20:35 -0800 Subject: [PATCH] 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. --- desktop_version/src/Music.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 47436c48..bd78cb39 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -180,27 +180,31 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade t %= num_pppppp_tracks; } - if(mmmmmm && !usingmmmmmm) + if (mmmmmm && !usingmmmmmm) { t += num_mmmmmm_tracks; } + safeToProcessMusic = true; musicVolume = MIX_MAX_VOLUME; - if (currentsong !=t) + + if (currentsong != t) { if (t != -1) { currentsong = t; + if (!INBOUNDS_VEC(t, musicTracks)) { puts("play() out-of-bounds!"); currentsong = -1; return; } + 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 - if(Mix_FadeInMusicPos(musicTracks[t].m_music, 0, 0, position_sec)==-1) + if (Mix_FadeInMusicPos(musicTracks[t].m_music, 0, 0, position_sec) == -1) { printf("Mix_FadeInMusicPos: %s\n", Mix_GetError()); } @@ -213,6 +217,7 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade nicechange = t; nicefade = true; currentsong = -1; + if (quick_fade) { Mix_FadeOutMusic(500); // fade out quicker @@ -222,7 +227,7 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade quick_fade = true; } } - else if(Mix_FadeInMusicPos(musicTracks[t].m_music, -1, fadein_ms, position_sec)==-1) + else if (Mix_FadeInMusicPos(musicTracks[t].m_music, -1, fadein_ms, position_sec) == -1) { printf("Mix_FadeInMusicPos: %s\n", Mix_GetError()); }