Merge branch 'development' into pre4-testing

# Conflicts:
#	Entities/HDFirearm.cpp - Used pre4-testing version since Deactivate plays the deactivation sound anyway
#	Entities/SoundContainer.h - Used development version since there wasn't really a conflict

Author: garethyr

Entities/ACrab.cpp

@@ -2647,8 +2647,10 @@ void ACrab::Draw(BITMAP *pTargetBitmap, const Vector &targetPos, DrawMode mode,
     }
 
     if (mode == g_DrawColor && !onlyPhysical && g_SettingsMan.DrawLimbPathVisualizations()) {
-        m_Paths[LEFTSIDE][WALK]->Draw(pTargetBitmap, targetPos, 122);
-        m_Paths[RIGHTSIDE][WALK]->Draw(pTargetBitmap, targetPos, 122);
+        m_Paths[LEFTSIDE][BGROUND][WALK].Draw(pTargetBitmap, targetPos, 122);
+        m_Paths[LEFTSIDE][FGROUND][WALK].Draw(pTargetBitmap, targetPos, 122);
+        m_Paths[RIGHTSIDE][BGROUND][WALK].Draw(pTargetBitmap, targetPos, 122);
+        m_Paths[RIGHTSIDE][FGROUND][WALK].Draw(pTargetBitmap, targetPos, 122);
     }
 }
 

Entities/HDFirearm.cpp

@@ -173,7 +173,6 @@ int HDFirearm::ReadProperty(const std::string_view &propName, Reader &reader) {
 	} else if (propName == "DeactivationSound") {
 		m_DeactivationSound = new SoundContainer;
         reader >> m_DeactivationSound;
-        m_DeactivationSound->SetSoundOverlapMode(SoundContainer::SoundOverlapMode::RESTART);
     } else if (propName == "EmptySound") {
 		m_EmptySound = new SoundContainer;
 		reader >> m_EmptySound;
@@ -617,6 +616,7 @@ void HDFirearm::Activate() {
     HeldDevice::Activate();
 
     if (!IsReloading()) {
+		if (m_DeactivationSound && m_DeactivationSound->IsBeingPlayed()) { m_DeactivationSound->FadeOut(); }
         if (m_ActiveSound && !m_ActiveSound->IsBeingPlayed()) { m_ActiveSound->Play(this->m_Pos); }
         if (m_PreFireSound && !wasActivated && !m_PreFireSound->IsBeingPlayed()) { m_PreFireSound->Play(this->m_Pos); }
 		if (IsEmpty()) { Reload(); }
@@ -635,9 +635,9 @@ void HDFirearm::Deactivate() {
     HeldDevice::Deactivate();
     m_FiredOnce = false;
 
-	if (m_PreFireSound) { m_PreFireSound->Stop(); }
+	if (m_PreFireSound) { m_PreFireSound->FadeOut(); }
     if (m_FireSound && m_FireSound->GetLoopSetting() == -1) { m_FireSound->Stop(); }
-    if (m_DeactivationSound && wasActivated && m_pMagazine && !m_pMagazine->IsEmpty()) { m_DeactivationSound->Play(m_Pos); }
+    if (m_DeactivationSound && wasActivated && m_FiredLastFrame) { m_DeactivationSound->Play(m_Pos); }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -960,11 +960,9 @@ void HDFirearm::Update()
     // Do stuff to deactivate after being activated
     if (!m_Activated)
     {
-		if (m_AlreadyClicked && m_FiredLastFrame && m_DeactivationSound) { m_DeactivationSound->Play(m_Pos); }
         // Reset the click indicator.
         m_AlreadyClicked = false;
 
-		if (m_PreFireSound) { m_PreFireSound->Stop(); }
         // Stop any looping activation sounds
         if (m_FireSound && m_FireSound->GetLoopSetting() == -1)// && m_FireSound->IsBeingPlayed())
             m_FireSound->Stop();

Entities/SoundSet.cpp

@@ -17,7 +17,7 @@ namespace RTE {
 
 	void SoundSet::Clear() {
 		m_SoundSelectionCycleMode = SoundSelectionCycleMode::RANDOM;
-		m_CurrentSelection = {false, 0};
+		m_CurrentSelection = {false, -1};
 
 		m_SoundData.clear();
 		m_SubSoundSets.clear();
@@ -286,9 +286,7 @@ namespace RTE {
 			case 0:
 				return false;
 			case 1:
-				break;
-			case 2:
-				selectSoundForwards();
+				m_CurrentSelection.second = 0;
 				break;
 			default:
 				switch (m_SoundSelectionCycleMode) {

Entities/SoundSet.h

@@ -210,7 +210,7 @@ namespace RTE {
 		static const std::unordered_map<std::string, SoundSet::SoundSelectionCycleMode> c_SoundSelectionCycleModeMap; //!< A map of strings to SoundSelectionCycleModes to support string parsing for the SoundCycleMode enum. Populated in the implementing cpp file.
 
 		SoundSelectionCycleMode m_SoundSelectionCycleMode; //!< The SoundSelectionCycleMode for this SoundSet.
-		std::pair<bool, int> m_CurrentSelection; //!< Whether the currently selection is in the SoundData (false) or SoundSet (true) vector, and its index in the appropriate vector.
+		std::pair<bool, int> m_CurrentSelection; //!< Whether the current selection is in the SoundData (false) or SoundSet (true) vector, and its index in the appropriate vector.
 
 		std::vector<SoundData> m_SoundData; //!< The SoundData available for selection in this SoundSet.
 		std::vector<SoundSet> m_SubSoundSets; //!< The sub SoundSets available for selection in this SoundSet.

System/Entity.cpp

@@ -54,18 +54,7 @@ namespace RTE {
 			if (preset) {
 				preset->Clone(this);
 			} else {
-				if (className == "AtomGroup" || className == "Attachable" || className == "AEmitter") {
-					reader.ReportError("The PresetName to be copied was not found in data modules.");
-				}
-				// If we couldn't find the preset to copy from, read it as an original but report the problem in the console
-				g_ConsoleMan.PrintString("ERROR: Couldn't find the preset '" + refName + "' accessed in " + reader.GetCurrentFilePath() + " at line " + reader.GetCurrentFileLine());
-				// Preset name might have "[ModuleName]/" preceding it, detect it here and select proper module!
-				int slashPos = refName.find_first_of('/');
-				m_PresetName = (slashPos != std::string::npos) ? refName.substr(slashPos + 1) : refName;
-				// Mark this so that the derived class knows it should be added to the PresetMan when it's done reading all properties.
-				m_IsOriginalPreset = true;
-				// Indicate where this was read from
-				m_DefinedInModule = reader.GetReadModuleID();
+				reader.ReportError("Couldn't find the preset \"" + refName + "\" of type \"" + className + "\" when trying to do CopyOf.");
 			}
 		} else if (propName == "PresetName" || propName == "InstanceName") {
 			SetPresetName(reader.ReadPropValue());