Formatting

Author: Causeless

Source/Lua/LuaAdapterDefinitions.h

@@ -439,7 +439,7 @@ namespace RTE {
 		static bool CyclePlayingSoundContainers2(MusicMan& musicMan, bool fadeOutCurrent);
 	};
 #pragma endregion
-	
+
 #pragma region TimerMan Lua Adapters
 	struct LuaAdaptersTimerMan {
 		/// Gets the current number of ticks that the simulation should be updating with. Lua can't handle int64 (or long long apparently) so we'll expose this specialized function.

Source/Managers/ActivityMan.cpp

@@ -292,7 +292,7 @@ int ActivityMan::StartActivity(Activity* activity) {
 	m_Activity.reset(dynamic_cast<Activity*>(m_StartActivity->Clone()));
 
 	g_MusicMan.ResetMusicState();
-	
+
 	m_Activity->SetupPlayers();
 	int error = m_Activity->Start();
 
@@ -315,7 +315,7 @@ int ActivityMan::StartActivity(Activity* activity) {
 
 	// Reset the mouse input to the center
 	g_UInputMan.SetMouseValueMagnitude(0.05F);
-	
+
 	g_AudioMan.PauseIngameSounds(false);
 
 	g_PerformanceMan.ResetPerformanceTimings();

Source/Managers/MusicMan.cpp

@@ -122,7 +122,8 @@ bool MusicMan::PlayDynamicSong(const std::string& songName, const std::string& s
 				if (m_PreviousSoundContainer) {
 					m_PreviousSoundContainer->Stop();
 					m_PreviousSoundContainer = nullptr;
-				}	
+				}
+
 				if (m_CurrentSoundContainer) {
 					m_PreviousSoundContainerSetToFade = true;
 					m_MusicFadeTimer.Reset();
@@ -186,14 +187,15 @@ bool MusicMan::EndDynamicMusic(bool fadeOutCurrent) {
 	}
 
 	m_CurrentSong = nullptr;
-	
+
 	if (m_PreviousSoundContainer && m_PreviousSoundContainer->IsBeingPlayed()) {
 		m_PreviousSoundContainer->FadeOut(500);
 	}
+
 	if (fadeOutCurrent && m_CurrentSoundContainer && m_CurrentSoundContainer->IsBeingPlayed()) {
 		m_CurrentSoundContainer->FadeOut(2000);
 	}
-	
+
 	m_MusicTimer.Reset();
 	m_MusicTimer.SetRealTimeLimitMS(0);
 	m_MusicPausedTime = 0.0;
@@ -218,7 +220,7 @@ void MusicMan::PlayInterruptingMusic(SoundContainer* soundContainer) {
 	if (m_NextSoundContainer != nullptr) {
 		m_NextSoundContainer->SetPaused(true);
 	}
-	
+
 	m_InterruptingMusicSoundContainer = std::unique_ptr<SoundContainer>(dynamic_cast<SoundContainer*>(soundContainer->Clone()));
 	m_InterruptingMusicSoundContainer->Play();
 	if (m_IsPlayingDynamicMusic) {
@@ -254,16 +256,18 @@ void MusicMan::EndInterruptingMusic() {
 }
 
 void MusicMan::SelectNextSongSection() {
-	if (!m_CurrentSongSection || m_CurrentSongSection->GetSectionType() != m_CurrentSongSectionType) {
-		for (DynamicSongSection& dynamicSongSection: m_CurrentSong->GetSongSections()) {
-			if (dynamicSongSection.GetSectionType() == m_CurrentSongSectionType) {
-				m_CurrentSongSection = &dynamicSongSection;
-				return;
-			}
-		}
-	} else {
+	if (m_CurrentSongSection && m_CurrentSongSection->GetSectionType() == m_CurrentSongSectionType) {
+		// Our current song section is already suitable
 		return;
 	}
+
+	for (DynamicSongSection& dynamicSongSection: m_CurrentSong->GetSongSections()) {
+		if (dynamicSongSection.GetSectionType() == m_CurrentSongSectionType) {
+			m_CurrentSongSection = &dynamicSongSection;
+			return;
+		}
+	}
+
 	m_CurrentSongSection = &m_CurrentSong->GetDefaultSongSection();
 }
 

Source/Managers/MusicMan.h

@@ -11,7 +11,6 @@ namespace RTE {
 	class MusicMan : public Singleton<MusicMan> {
 
 	public:
-
 #pragma region Creation
 		/// Constructor method used to instantiate a MusicMan object in system memory.
 		/// Create() should be called before using the object.
@@ -98,11 +97,11 @@ namespace RTE {
 		SoundContainer* m_ScenarioMenuMusicSoundContainer; //!< SoundContainer for hardcoded scenario menu music.
 
 		std::unique_ptr<SoundContainer> m_InterruptingMusicSoundContainer; //!< Current interrupting music being played.
-		
+
 		std::unique_ptr<DynamicSong> m_CurrentSong; //!< The current DynamicSong being played.
 		std::string m_CurrentSongSectionType; //!< The current type of DynamicSongSection we are trying to play.
 		DynamicSongSection* m_CurrentSongSection; //!< The current DynamicSongSection we are actually playing.
-		
+
 		std::unique_ptr<SoundContainer> m_PreviousSoundContainer; //!< The previous SoundContainer that was played as music. We keep it to allow it to play out while Current ramps up.
 		std::unique_ptr<SoundContainer> m_CurrentSoundContainer; //!< The current selected SoundContainer playing as music.
 		SoundContainer* m_NextSoundContainer; //!< The next selected SoundContainer to play as music.