Cleanup pitch setting in ADoor and HDFirearm since SetPitch is nicer now

Some minor comment cleanups in SoundContainer header
Fix up NetworkClient to support audioman and soundcontainer changes
Clean up contentfile a little

Author: garethyr

Entities/ADoor.cpp

@@ -422,7 +422,7 @@ namespace RTE {
 			m_SpriteAnimDuration = LERP(0, m_MaxHealth, 10, m_InitialSpriteAnimDuration, m_Health);
 
 			if (!m_DoorMoveSound.IsBeingPlayed()) { m_DoorMoveSound.Play(m_Pos); }
-			g_AudioMan.SetSoundPitch(&m_DoorMoveSound, LERP(10, m_InitialSpriteAnimDuration, 2, 1, m_SpriteAnimDuration) * g_AudioMan.GetGlobalPitch());
+			m_DoorMoveSound.SetPitch(LERP(10, m_InitialSpriteAnimDuration, 2, 1, m_SpriteAnimDuration));
 
 			m_Health -= 0.4F;
 		}

Entities/HDFirearm.cpp

@@ -1009,13 +1009,13 @@ void HDFirearm::Update()
                 if (m_Activated && !m_Reloading && m_ActivationTimer.GetElapsedSimTimeMS() < m_ActivationDelay)
                 {
                     animDuration = (int)LERP(0, m_ActivationDelay, (float)(m_SpriteAnimDuration * 10), (float)m_SpriteAnimDuration, m_ActivationTimer.GetElapsedSimTimeMS());
-                    g_AudioMan.SetSoundPitch(&m_ActiveSound, LERP(0, m_ActivationDelay, 0, 1.0, m_ActivationTimer.GetElapsedSimTimeMS()) * g_AudioMan.GetGlobalPitch());
+                    m_ActiveSound.SetPitch(LERP(0, m_ActivationDelay, 0, 1.0, m_ActivationTimer.GetElapsedSimTimeMS()));
                 }
                 // Spin down
                 if ((!m_Activated || m_Reloading) && m_LastFireTmr.GetElapsedSimTimeMS() < m_DeactivationDelay)
                 {
                     animDuration = (int)LERP(0, m_DeactivationDelay, (float)m_SpriteAnimDuration, (float)(m_SpriteAnimDuration * 10), m_LastFireTmr.GetElapsedSimTimeMS());
-                    g_AudioMan.SetSoundPitch(&m_ActiveSound, LERP(0, m_DeactivationDelay, 1.0, 0, m_LastFireTmr.GetElapsedSimTimeMS()) * g_AudioMan.GetGlobalPitch());
+                    m_ActiveSound.SetPitch(LERP(0, m_DeactivationDelay, 1.0, 0, m_LastFireTmr.GetElapsedSimTimeMS()));
                 }
 
                 if (animDuration > 0 && !(m_Reloading && m_LastFireTmr.GetElapsedSimTimeMS() >= m_DeactivationDelay))

Entities/SoundContainer.h

@@ -301,8 +301,8 @@ namespace RTE {
 		/// <summary>
 		/// Sets the volume sounds in this SoundContainer should be played at. Note that this does not factor volume changes due to the SoundContainer's position. Does not affect currently playing sounds.
 		/// </summary>
-		/// <param name="newVolume">The new volume sounds in this SoundContainer should be played at.</param>
-		void SetVolume(float newVolume) { newVolume = std::clamp(newVolume, 0.0F, 1.0F); if (IsBeingPlayed()) { g_AudioMan.ChangePlayingSoundContainerVolume(this, newVolume); } m_Volume = newVolume; }
+		/// <param name="newVolume">The new volume sounds in this SoundContainer should be played at. Limited between 0 and 10.</param>
+		void SetVolume(float newVolume) { newVolume = std::clamp(newVolume, 0.0F, 10.0F); if (IsBeingPlayed()) { g_AudioMan.ChangePlayingSoundContainerVolume(this, newVolume); } m_Volume = newVolume; }
 
 		/// <summary>
 		/// Gets the pitch the sounds in this SoundContainer are played at. Note that this does not factor in global pitch.
@@ -311,9 +311,9 @@ namespace RTE {
 		float GetPitch() const { return m_Pitch; }
 
 		/// <summary>
-		/// Sets the pitch sounds in this SoundContainer should be played at and updates any playing instances accordingly. Note that this does not factor in global pitch.
+		/// Sets the pitch sounds in this SoundContainer should be played at and updates any playing instances accordingly.
 		/// </summary>
-		/// <param name="newPitch">The new pitch sounds in this SoundContainer should be played at.</param>
+		/// <param name="newPitch">The new pitch sounds in this SoundContainer should be played at. Limited between 0.125 and 8 (8 octaves up or down).</param>
 		void SetPitch(float newPitch) { newPitch = std::clamp(newPitch, 0.125F, 8.0F); if (IsBeingPlayed()) { g_AudioMan.ChangePlayingSoundContainerPitch(this, newPitch); } m_Pitch = newPitch; }
 #pragma endregion
 

Managers/NetworkClient.cpp

@@ -609,20 +609,32 @@ namespace RTE {
 										soundContainerToHandle->Stop();
 										soundContainerToHandle->Reset();
 									}
-									soundContainerToHandle->Create(sndDataPtr->Loops, sndDataPtr->AffectedByGlobalPitch, sndDataPtr->AttenuationStartDistance, sndDataPtr->Immobile);
 									for (size_t soundFileHash : sndDataPtr->SoundFileHashes) {
 										if (soundFileHash != 0) { soundContainerToHandle->AddSound(ContentFile::GetPathFromHash(soundFileHash)); }
 									}
-									g_AudioMan.PlaySound(soundContainerToHandle, Vector(sndDataPtr->Position[0], sndDataPtr->Position[1]), -1, -1, sndDataPtr->Pitch);
+									soundContainerToHandle->SetImmobile(sndDataPtr->Immobile);
+									soundContainerToHandle->SetAttenuationStartDistance(sndDataPtr->AttenuationStartDistance);
+									soundContainerToHandle->SetLoopSetting(sndDataPtr->Loops);
+
+									//soundContainerToHandle->SetPriority(sndDataPtr.Priority);
+									soundContainerToHandle->SetAffectedByGlobalPitch(sndDataPtr->AffectedByGlobalPitch);
+									
+									soundContainerToHandle->SetPosition(Vector(sndDataPtr->Position[0], sndDataPtr->Position[1]));
+									soundContainerToHandle->SetVolume(sndDataPtr->Volume);
+									soundContainerToHandle->SetPitch(sndDataPtr->Pitch);
+									soundContainerToHandle->Play();
 									break;
 								case AudioMan::SOUND_STOP:
 									soundContainerToHandle->Stop();
 									break;
 								case AudioMan::SOUND_SET_POSITION:
 									soundContainerToHandle->SetPosition(Vector(sndDataPtr->Position[0], sndDataPtr->Position[1]));
 									break;
+								case AudioMan::SOUND_SET_VOLUME:
+									soundContainerToHandle->SetVolume(sndDataPtr->Volume);
+									break;
 								case AudioMan::SOUND_SET_PITCH:
-									g_AudioMan.SetSoundPitch(soundContainerToHandle, sndDataPtr->Pitch);
+									soundContainerToHandle->SetPitch(sndDataPtr->Pitch);
 									break;
 								case AudioMan::SOUND_FADE_OUT:
 									g_AudioMan.FadeOutSound(soundContainerToHandle, sndDataPtr->FadeOutTime);

System/ContentFile.cpp

@@ -190,7 +190,6 @@ namespace RTE {
 		}
 		FMOD::Sound *returnSample = nullptr;
 
-		// Check if the file has already been read and loaded from the disk and, if so, use that data.
 		std::unordered_map<std::string, FMOD::Sound *>::iterator foundSound = s_LoadedSamples.find(m_DataPath);
 		if (foundSound != s_LoadedSamples.end()) {
 			returnSample = (*foundSound).second;

System/ContentFile.h

@@ -150,10 +150,10 @@ namespace RTE {
 		/// <summary>
 		/// Loads and transfers the data represented by this ContentFile object as an FMOD FSOUND_SAMPLE. Ownership of the FSOUND_SAMPLE is NOT transferred!
 		/// </summary>
-		/// <param name="abortGameForInvalidSound">Whether to abort the game if the sound couldn't be added, or just show a console error. Default true.</param>
+		/// <param name="abortGameForInvalidSound">Whether to abort the game if the sound couldn't be added, or just show a console error</param>
 		/// <param name="asyncLoading">Whether to enable FMOD asynchronous loading or not. Should be disabled for loading audio files with Lua AddSound.
 		/// <returns>Pointer to the FSOUND_SAMPLE loaded from disk.</returns>
-		FMOD::Sound * LoadAndReleaseSample(bool abortGameForInvalidSound = true, bool asyncLoading = true);
+		FMOD::Sound * LoadAndReleaseSample(bool abortGameForInvalidSound, bool asyncLoading);
 #pragma endregion
 
 #pragma region Class Info