Changed argument ordering of AudioMan::StopSound for consistency

Added Global Playback and Handling audioman region
Added RTETools to audioman header to have access to limit
Moved g_SoundEventsListMutex to a working spot

Author: garethyr

Entities/SoundContainer.h

@@ -230,7 +230,7 @@ namespace RTE {
 		/// </summary>
 		/// <param name="player">Player to stop playback of this SoundContainer for.</param>
 		/// <returns>Whether this SoundContainer successfully stopped playing.</returns>
-		bool Stop(int player) { return HasAnySounds() ? g_AudioMan.StopSound(player, this) : false; }
+		bool Stop(int player) { return HasAnySounds() ? g_AudioMan.StopSound(this, player) : false; }
 
 		/// <summary>
 		/// Selects, saves and returns the next sound of this SoundContainer to be played.

Managers/AudioMan.cpp

@@ -481,7 +481,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool AudioMan::StopSound(int player, SoundContainer *pSoundContainer) {
+	bool AudioMan::StopSound(SoundContainer *pSoundContainer, int player) {
 		if (m_IsInMultiplayerMode && pSoundContainer) {
 			RegisterSoundEvent(player, SOUND_STOP, pSoundContainer->GetHash(), 0, pSoundContainer->GetPlayingChannels(), pSoundContainer->GetLoopSetting(), 1.0, pSoundContainer->IsAffectedByGlobalPitch());
 		}

Managers/AudioMan.h

@@ -2,6 +2,7 @@
 #define _RTEAUDIOMAN_
 
 #include "Constants.h"
+#include "RTETools.h"
 #include "Entity.h"
 #include "Timer.h"
 #include "Singleton.h"
@@ -219,10 +220,12 @@ namespace RTE {
 		bool SetSoundPitch(SoundContainer *pSound, float pitch);
 #pragma endregion
 
+#pragma region Global Playback and Handling
 		/// <summary>
 		/// Stops all playback and clears the music playlist.
 		/// </summary>
 		void StopAll() { if (m_AudioEnabled) { m_MasterChannelGroup->stop(); } m_MusicPlayList.clear(); }
+#pragma endregion
 
 #pragma region Music Playback and Handling
 		/// <summary>
@@ -319,7 +322,7 @@ namespace RTE {
 		/// <param name="player">Which player to stop the SoundContainer  for.</param>
 		/// <param name="pSound">Pointer to the SoundContainer to stop playing. Ownership is NOT transferred!</param>
 		/// <returns></returns>
-		bool StopSound(int player, SoundContainer *pSound);
+		bool StopSound(SoundContainer *pSound, int player);
 
 		/// <summary>
 		/// Fades out playback of all sounds in a specific SoundContainer.
@@ -404,6 +407,8 @@ namespace RTE {
 		std::list<NetworkSoundData> m_SoundEvents[c_MaxClients]; //!< Lists of per player sound events.
 		std::list<NetworkMusicData> m_MusicEvents[c_MaxClients]; //!< Lists of per player music events.
 
+		std::mutex g_SoundEventsListMutex[c_MaxClients]; //!< A list for locking sound events for multiplayer to avoid race conditions and other such problems.
+
 	private:
 		/// <summary>
 		/// A static callback function for FMOD to invoke when the music channel finishes playing. See fmod docs - FMOD_SYSTEM_CALLBACK for details

Managers/LuaMan.cpp

@@ -1500,7 +1500,7 @@ int LuaMan::Create()
             .def("PlaySound", (SoundContainer *(AudioMan:: *)(const char *filePath, float attenuation, int player)) &AudioMan::PlaySound)
             .def("PlaySound", (SoundContainer * (AudioMan:: *)(const char *filePath, float attenuation, int player, int loops, int priority, double pitchOrAffectedByGlobalPitch)) &AudioMan::PlaySound)
             .def("StopSound", (bool (AudioMan:: *)(SoundContainer *soundContainer)) &AudioMan::StopSound)
-            .def("StopSound", (bool (AudioMan:: *)(int player, SoundContainer *soundContainer)) &AudioMan::StopSound)
+            .def("StopSound", (bool (AudioMan:: *)(SoundContainer *soundContainer, int player)) &AudioMan::StopSound)
             .def("FadeOutSound", &AudioMan::FadeOutSound),
 
         class_<UInputMan>("UInputManager")