Added reader error if SoundContainer priority is outside limits, and added safety to priority setter to keep it within limits

Made sure music priority is always high

Author: garethyr

Entities/SoundContainer.cpp

@@ -50,6 +50,9 @@ namespace RTE {
 			reader >> m_Loops;
 		} else if (propName == "Priority") {
 			reader >> m_Priority;
+			if (m_Priority < 0 || m_Priority > 256) {
+				reader.ReportError("SoundContainer priority must be between 256 (lowest priority) and 0 (highest priority).");
+			}
 		} else if (propName == "AffectedByGlobalPitch") {
 			reader >> m_AffectedByGlobalPitch;
 		} else {

Entities/SoundContainer.h

@@ -191,7 +191,7 @@ namespace RTE {
 		/// Sets the current playback priority. Higher value will make this more likely to make it into mixing on playback.
 		/// </summary>
 		/// <param name="priority">The new priority. See AudioMan::PRIORITY_* enumeration.</param>
-		void SetPriority(int priority) { m_Priority = priority; }
+		void SetPriority(int priority) { m_Priority = Limit(priority, 255, 0); }
 
 		/// <summary>
 		/// Gets whether the sounds in this SoundContainer are affected by global pitch changes or not.

Managers/AudioMan.cpp

@@ -288,7 +288,7 @@ namespace RTE {
 				g_ConsoleMan.PrintString("ERROR: Could not open music file " + std::string(filePath) + ": " + std::string(FMOD_ErrorString(result)));
 				return;
 			}
-
+			
 			result = musicStream->setLoopCount(loops);
 			if (result != FMOD_OK && (loops != 0 && loops != 1)) {
 				g_ConsoleMan.PrintString("ERROR: Failed to set looping for music file: " + std::string(filePath) + ". This means it will only play 1 time, instead of " + (loops == 0 ? "looping endlessly." : loops + " times.") + std::string(FMOD_ErrorString(result)));
@@ -300,6 +300,7 @@ namespace RTE {
 				g_ConsoleMan.PrintString("ERROR: Could not play music file: " + std::string(filePath));
 				return;
 			}
+			result = musicChannel->setPriority(PRIORITY_HIGH);
 
 			if (volumeOverrideIfNotMuted >= 0 && m_MusicVolume > 0) {
 				result = musicChannel->setVolume(volumeOverrideIfNotMuted);