Moved GUISound initialization and construction since it can be done safely outside of AudioMan now

Added comment to SoundContainer lambda, fixed non-referenced based range for loop, added constnesses to GetSoundDataForSound method.
Fixed Vector to FMOD_VECTOR conversion trying to use scene dimensions if the scene isn't loaded, since the assert makes this unsafe.
Fixed bad typing on sound max audible distance that would cut it off (it was a u short instead of a u int)
Removed junk member variable from GUISound (poopsound)

Author: garethyr

Entities/SoundContainer.cpp

@@ -113,6 +113,13 @@ namespace RTE {
 		std::string propValue = reader.ReadPropValue();
 		SoundData soundData;
 
+		/// <summary>
+		/// This lambda exists to have some easy, private reused code.
+		/// It loads an audio file by path in as a ContentFile, which in turn loads it into FMOD, then returns SoundData for it in the outParam outSoundData.
+		/// </summary>
+		/// <param name="soundPath">The path to the sound file.</param>
+		/// <param name="parentReader">The reader being used when calling this. Used to report errors if loading the sound fails.</param>
+		/// <param name="outSoundData">The outParam for the SoundData struct produced by reading the given sound.</param>
 		auto readSound = [](const std::string &soundPath, Reader &parentReader, SoundData *outSoundData) {
 			ContentFile soundFile(soundPath.c_str());
 			FMOD::Sound *soundObject = soundFile.GetAsSample();
@@ -174,9 +181,9 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	SoundContainer::SoundData *SoundContainer::GetSoundDataForSound(FMOD::Sound *sound) {
-		for (std::vector<SoundData> soundSet : m_SoundSets) {
-			for (SoundData soundData : soundSet) {
+	const SoundContainer::SoundData *SoundContainer::GetSoundDataForSound(const FMOD::Sound *sound) const {
+		for (std::vector<SoundData> const &soundSet : m_SoundSets) {
+			for (SoundData const &soundData : soundSet) {
 				if (sound == soundData.SoundObject) {
 					return &soundData;
 				}

Entities/SoundContainer.h

@@ -230,7 +230,7 @@ namespace RTE {
 		/// </summary>
 		/// <param name="sound">The FMOD::Sound to search for.</param>
 		/// <returns>A pointer to the corresponding SoundData or a null pointer.</returns>
-		SoundData *GetSoundDataForSound(FMOD::Sound *sound);
+		const SoundData *GetSoundDataForSound(const FMOD::Sound *sound) const;
 #pragma endregion
 
 #pragma region Sound Property Getters and Setters

GUI/GUISound.h

@@ -205,7 +205,6 @@ namespace RTE {
 #pragma endregion
 
 	protected:
-		SoundContainer m_PoopSound;
 		SoundContainer m_SplashSound; //! Juicy logo signature jingle sound.
 
 		SoundContainer m_EnterMenuSound; //! SoundContainer for enabling menu.

Main.cpp

@@ -1880,6 +1880,7 @@ int main(int argc, char *argv[]) {
     new PresetMan();
     new FrameMan();
     new AudioMan();
+    new GUISound();
     new UInputMan();
     new ActivityMan();
     new MovableMan();
@@ -1907,7 +1908,6 @@ int main(int argc, char *argv[]) {
     g_TimerMan.Create();
     g_PresetMan.Create();
     g_FrameMan.Create();
-    //NOTE: By necessity of when things can be instantiated, this internally does: new GUISound()
     if (g_AudioMan.Create() >= 0) {
         g_GUISound.Create();
     }

Managers/AudioMan.cpp

@@ -53,9 +53,6 @@ namespace RTE {
 
 		m_AudioEnabled = audioSystemSetupResult == FMOD_OK;
 
-		// NOTE: Anything that instantiates SoundContainers needs to wait until the Audio System is up and running before they start doing that. It'll fail safely even if Audio is not enabled.
-		new GUISound();
-
 		if (!m_AudioEnabled) {
 			g_ConsoleMan.PrintString("ERROR: Failed to enable audio: " + std::string(FMOD_ErrorString(audioSystemSetupResult)));
 			return -1;
@@ -749,14 +746,14 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	FMOD_VECTOR AudioMan::GetAsFMODVector(const Vector &vector, float zValue) {
-		Vector sceneDimensions = g_SceneMan.GetSceneDim();
+		Vector sceneDimensions = g_SceneMan.GetScene() ? g_SceneMan.GetSceneDim() : Vector();
 		return sceneDimensions.IsZero() ? FMOD_VECTOR{0, 0, zValue} : FMOD_VECTOR{vector.m_X, sceneDimensions.m_Y - vector.m_Y, zValue};
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	Vector AudioMan::GetAsVector(FMOD_VECTOR fmodVector) {
-		Vector sceneDimensions = g_SceneMan.GetSceneDim();
+		Vector sceneDimensions = g_SceneMan.GetScene() ? g_SceneMan.GetSceneDim() : Vector();
 		return sceneDimensions.IsZero() ? Vector() : Vector(fmodVector.x, sceneDimensions.m_Y - fmodVector.y);
 	}
 }

System/Constants.h

@@ -42,7 +42,7 @@ namespace RTE {
 	static constexpr unsigned short c_MinimumDistanceForPanning = 50; //!< The minimum distance before which sound panning should not occur. Not relevant for immobile sounds or in splitscreen.
 	*/
 	static constexpr unsigned short c_DefaultAttenuationStartDistance = 100; //!< The default start distance for attenuating sounds. Individual sounds can have different values for this.
-	static constexpr unsigned short c_SoundMaxAudibleDistance = 100000; //!< The maximum distance at which any sound can possibly be heard, after which point it will have 0 volume. Arbitrary default suggested by FMOD.
+	static constexpr unsigned int c_SoundMaxAudibleDistance = 100000; //!< The maximum distance at which any sound can possibly be heard, after which point it will have 0 volume. Arbitrary default suggested by FMOD.
 #pragma endregion
 
 #pragma region Network Constants