Fixed wound sounds blocking each other too much

Author: comradeshook

Source/Entities/AEmitter.cpp

@@ -397,9 +397,9 @@ void AEmitter::Update() {
 		float throttleFactor = GetThrottleFactor();
 		m_FlashScale = throttleFactor;
 		// Check burst triggering against whether the spacing is fulfilled
-		if (m_PlayBurstSound && m_BurstTriggered && CanTriggerBurst()) {
+		if (m_BurstTriggered && CanTriggerBurst()) {
 			// Play burst sound
-			if (m_BurstSound) {
+			if (m_BurstSound && m_PlayBurstSound) {
 				m_BurstSound->Play(m_Pos);
 			}
 			// Start timing until next burst

Source/Entities/MOSRotating.cpp

@@ -56,7 +56,7 @@ void MOSRotating::Clear() {
 	m_RecoilForce.Reset();
 	m_RecoilOffset.Reset();
 	m_Wounds.clear();
-	m_WoundBurstSoundPlayedThisFrame = false;
+	m_WoundBurstSoundsPlayedThisFrame = {};
 	m_Attachables.clear();
 	m_ReferenceHardcodedAttachableUniqueIDs.clear();
 	m_HardcodedAttachableUniqueIDsAndSetters.clear();
@@ -462,10 +462,14 @@ void MOSRotating::AddWound(AEmitter* woundToAdd, const Vector& parentOffsetToSet
 		woundToAdd->SetParent(this);
 		woundToAdd->SetIsWound(true);
 		if (woundToAdd->GetBurstSound()) {
-			if (m_WoundBurstSoundPlayedThisFrame) {
-				woundToAdd->SetPlayBurstSound(false);
+			std::string burstSound = woundToAdd->GetBurstSound()->GetPresetName();
+			for (int i = 0; i < m_WoundBurstSoundsPlayedThisFrame.size(); i++) {
+				if (burstSound == m_WoundBurstSoundsPlayedThisFrame[i]) {
+					woundToAdd->SetPlayBurstSound(false);
+					break;
+				}
 			}
-			m_WoundBurstSoundPlayedThisFrame = true;
+			m_WoundBurstSoundsPlayedThisFrame.push_back(burstSound);
 		}
 		if (woundToAdd->HasNoSetDamageMultiplier()) {
 			woundToAdd->SetDamageMultiplier(1.0F);
@@ -1366,7 +1370,7 @@ void MOSRotating::Update() {
 		m_Rotation += radsToGo * m_OrientToVel * velInfluence;
 	}
 
-	m_WoundBurstSoundPlayedThisFrame = false;
+	m_WoundBurstSoundsPlayedThisFrame = {};
 
 	for (auto woundItr = m_Wounds.begin(); woundItr != m_Wounds.end();) {
 		AEmitter* wound = *woundItr;

Source/Entities/MOSRotating.h

@@ -541,7 +541,7 @@ namespace RTE {
 		// The list of wound AEmitters currently attached to this MOSRotating, and owned here as well.
 		std::vector<AEmitter*> m_Wounds;
 		// Whether we added a wound with a BurstSound this frame or not, so we can disable further ones to avoid audio spam.
-		bool m_WoundBurstSoundPlayedThisFrame;
+		std::vector<std::string> m_WoundBurstSoundsPlayedThisFrame;
 		// The list of Attachables currently attached and Owned by this.
 		std::list<Attachable*> m_Attachables;
 		std::unordered_set<unsigned long> m_ReferenceHardcodedAttachableUniqueIDs; //!< An unordered set is filled with the Unique IDs of all of the reference object's hardcoded Attachables when using the copy Create.