Fixed copyof MOs that change the PresetName not having scripts loaded onto them.

Added sanity checking and percentage handling (i.e. >1 - 100) to volumeOverrideIfNotMuted. Also fixed some music related saftey checks I'd screwed up the boolean logic for.

Author: garethyr

Entities/MovableObject.h

@@ -307,10 +307,10 @@ ENTITYALLOCATION(MovableObject)
     virtual const Entity::ClassInfo & GetClass() const { return m_sClass; }
 
     /// <summary>
-    /// Override SetPresetName so it also resets script paths and script preset name. Note that this'll screw up lua that calls SetPresetName but that probably shouldn't be lua accessible anyway.
+    /// Override SetPresetName so it also resets script preset name and then reloads scripts to safely allow for multiple scripts.
     /// </summary>
     /// <param name="newName">A string reference with the instance name of this Entity.</param>
-    virtual void SetPresetName(const std::string &newName) override { Entity::SetPresetName(newName); m_ScriptPresetName.clear(); }
+    virtual void SetPresetName(const std::string &newName) override { Entity::SetPresetName(newName); m_ScriptPresetName.clear(); ReloadScripts(); }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Managers/AudioMan.cpp

@@ -185,7 +185,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	double AudioMan::GetMusicPosition() const {
-		if (m_AudioEnabled || IsMusicPlaying()) {
+		if (m_AudioEnabled && IsMusicPlaying()) {
 			FMOD_RESULT result;
 			FMOD::Channel *musicChannel;
 			unsigned int position;
@@ -202,7 +202,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void AudioMan::SetMusicPosition(double position) {
-		if (m_AudioEnabled || IsMusicPlaying()) {
+		if (m_AudioEnabled && IsMusicPlaying()) {
 			FMOD::Channel *musicChannel;
 			FMOD_RESULT result = m_MusicChannelGroup->getChannel(0, &musicChannel);
 
@@ -307,6 +307,7 @@ namespace RTE {
 			result = musicChannel->setPriority(PRIORITY_HIGH);
 
 			if (volumeOverrideIfNotMuted >= 0 && m_MusicVolume > 0) {
+				volumeOverrideIfNotMuted = Limit((volumeOverrideIfNotMuted > 1 ? volumeOverrideIfNotMuted / 100 : volumeOverrideIfNotMuted), 1, 0);
 				result = musicChannel->setVolume(volumeOverrideIfNotMuted);
 				if (result != FMOD_OK && (loops != 0 && loops != 1)) {
 					g_ConsoleMan.PrintString("ERROR: Failed to set volume override for music file: " + std::string(filePath) + ". This means it will stay at " + std::to_string(m_MusicVolume) + ": " + std::string(FMOD_ErrorString(result)));
@@ -477,7 +478,6 @@ namespace RTE {
 			}
 		}
 
-
 		// Now that the sound is playing we can register an event with the SoundContainer's channels, which can be used by clients to identify the sound being played.
 		if (m_IsInMultiplayerMode) {
 			RegisterSoundEvent(player, SOUND_PLAY, soundContainer->GetPlayingChannels(), &soundContainer->GetSelectedSoundHashes(), position, soundContainer->GetLoopSetting(), pitch, soundContainer->IsAffectedByGlobalPitch(), soundContainer->GetAttenuationStartDistance(), soundContainer->IsImmobile());