Merge pull request #581 from cortex-command-community/scene-area-echo

Echo Sound Changes
cortex-command-community · Dec 28, 2023 · fef9217 · fef9217
2 parents ff0497c + 91d7247
commit fef9217
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Entities/HDFirearm.cpp b/Entities/HDFirearm.cpp
@@ -22,6 +22,7 @@
 #include "ThrownDevice.h"
 #include "MOPixel.h"
 #include "Actor.h"
+#include "Scene.h"
 
 namespace RTE {
 
@@ -1062,7 +1063,12 @@ void HDFirearm::Update()
             if (m_FireSound && !(m_FireSound->GetLoopSetting() == -1 && m_FireSound->IsBeingPlayed())) {
                 m_FireSound->Play(m_Pos);
             }
-			if (m_FireEchoSound) { m_FireEchoSound->Play(m_Pos); }
+			if (m_FireEchoSound) {
+                Scene::Area* noEchoArea = g_SceneMan.GetScene()->GetOptionalArea("IndoorArea");
+                if (noEchoArea == nullptr || !noEchoArea->IsInside(m_Pos)) {
+                    m_FireEchoSound->Play(m_Pos); 
+                }
+            }
         }
 
 		if (m_Loudness > 0) { g_MovableMan.RegisterAlarmEvent(AlarmEvent(m_Pos, m_Team, m_Loudness)); }