Fixed initialization of network sound data members by using fill in RegisterSoundEvent

Cleaned up NetworkClient, reorganizing things so they actually work, and make more sense - sound containers are no longer deleted, they're just repurposed. I need to investigate this more, it may be that pooling was doing this already, but losing pointers to them could make the already handled set useless.

Author: garethyr

Managers/AudioMan.cpp

@@ -573,7 +573,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	void AudioMan::GetSoundEvents(int player, std::list<NetworkSoundData> & list) {
+	void AudioMan::GetSoundEvents(int player, std::list<NetworkSoundData> &list) {
 		if (player < 0 || player >= c_MaxClients) {
 			return;
 		}
@@ -600,9 +600,11 @@ namespace RTE {
 			if (player >= 0 && player < c_MaxClients) {
 				NetworkSoundData soundData;
 				soundData.State = state;
+				std::fill_n(soundData.Channels, c_MaxPlayingSoundsPerContainer, c_MaxAudioChannels + 1);
 				if (channels) {
 					std::copy(channels->begin(), channels->end(), soundData.Channels);
 				}
+				std::fill_n(soundData.SoundFileHashes, c_MaxAudioChannels, 0);
 				if (soundFileHashes) {
 					std::copy(soundFileHashes->begin(), soundFileHashes->end(), soundData.SoundFileHashes);
 				}

Managers/AudioMan.h

@@ -56,8 +56,8 @@ namespace RTE {
 
 		struct NetworkSoundData {
 			unsigned char State;
-			unsigned short int Channels[c_MaxPlayingSoundsPerContainer]{c_MaxAudioChannels + 1};
-			size_t SoundFileHashes[c_MaxAudioChannels]{0};
+			unsigned short int Channels[c_MaxPlayingSoundsPerContainer];
+			size_t SoundFileHashes[c_MaxAudioChannels];
 			short int Distance;
 			short int Loops;
 			float Pitch;

Managers/NetworkClient.cpp

@@ -675,27 +675,26 @@ namespace RTE
 			if (sndDataPtr->State == AudioMan::SOUND_SET_GLOBAL_PITCH) {
 				g_AudioMan.SetGlobalPitch(sndDataPtr->Pitch, sndDataPtr->AffectedByGlobalPitch); //Note AffectedByGlobalPitch is hackily used to determine whether this affects music
 			} else {
-				SoundContainer *newlyMadeSoundContainer;
-				if (sndDataPtr->State == AudioMan::SOUND_PLAY) {
-					newlyMadeSoundContainer = new SoundContainer();
-					newlyMadeSoundContainer->Create(sndDataPtr->Loops, sndDataPtr->AffectedByGlobalPitch);
-					for (size_t soundFileHash : sndDataPtr->SoundFileHashes) {
-						if (soundFileHash != 0) { newlyMadeSoundContainer->AddSound(ContentFile::GetPathFromHash(soundFileHash)); }
-					}
-					g_AudioMan.PlaySound(newlyMadeSoundContainer, sndDataPtr->Distance, -1, -1, sndDataPtr->Pitch);
-				}
-
-				// The set of channels that have already been handled for this event, used to potentially avoid repeating actions while still keeping being sure to potentially iterate over every provided channel index
+				// The set of SoundContainers that have already been handled for this event, used to hopefully avoid repeating actions when iterating over provided sound channel indices
 				std::unordered_set<SoundContainer *> alreadyHandledSoundContainers;
 
 				for (unsigned short serverSoundChannelIndex : sndDataPtr->Channels) {
-					if (serverSoundChannelIndex < c_MaxAudioChannels && m_ServerSounds.find(serverSoundChannelIndex) != m_ServerSounds.end()) {
-						SoundContainer *soundContainerToHandle = m_ServerSounds[serverSoundChannelIndex];
+					if (serverSoundChannelIndex < c_MaxAudioChannels && (sndDataPtr->State == AudioMan::SOUND_PLAY || m_ServerSounds.find(serverSoundChannelIndex) != m_ServerSounds.end())) {
+						SoundContainer *soundContainerToHandle = m_ServerSounds.find(serverSoundChannelIndex) == m_ServerSounds.end() ? NULL : m_ServerSounds.at(serverSoundChannelIndex);
 						if (alreadyHandledSoundContainers.find(soundContainerToHandle) == alreadyHandledSoundContainers.end()) {
 							switch (sndDataPtr->State) {
 								case AudioMan::SOUND_PLAY:
-									soundContainerToHandle->Stop();
-									delete soundContainerToHandle;
+									if (soundContainerToHandle == NULL) {
+										soundContainerToHandle = new SoundContainer();
+									} else {
+										soundContainerToHandle->Stop();
+										soundContainerToHandle->Reset();
+									}
+									soundContainerToHandle->Create(sndDataPtr->Loops, sndDataPtr->AffectedByGlobalPitch);
+									for (size_t soundFileHash : sndDataPtr->SoundFileHashes) {
+										if (soundFileHash != 0) { soundContainerToHandle->AddSound(ContentFile::GetPathFromHash(soundFileHash)); }
+									}
+									g_AudioMan.PlaySound(soundContainerToHandle, sndDataPtr->Distance, -1, -1, sndDataPtr->Pitch);
 									break;
 								case AudioMan::SOUND_STOP:
 									soundContainerToHandle->Stop();