Ticket #591: BugFix#591.patch

CCmpSoundManager.cpp

@@ -23 +23 @@
 #include "ps/CLogger.h"
 #include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpPosition.h"
+#include "simulation2/components/ICmpRangeManager.h"
 #include "sound/SoundGroup.h"
 
 class CCmpSoundManager : public ICmpSoundManager
@@ -110 +111 @@
 
         // Find the source's position, if possible
         // (TODO: we should do something more sensible if there's no position available)
-        CVector3D sourcePos(0, 0, 0);
-        if (source != INVALID_ENTITY)
+        CmpPtr<ICmpRangeManager> cmpRangeManager(GetSimContext(), SYSTEM_ENTITY);
+        ICmpRangeManager::ELosVisibility m_Visibility = cmpRangeManager->GetLosVisibility(source, GetSimContext().GetCurrentDisplayedPlayer());
+
+        if (m_Visibility == ICmpRangeManager::VIS_VISIBLE)
         {
-            CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), source);
-            if (!cmpPosition.null() && cmpPosition->IsInWorld())
-                sourcePos = CVector3D(cmpPosition->GetPosition());
+            CVector3D sourcePos(0, 0, 0);
+            if (source != INVALID_ENTITY)
+            {
+                CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), source);
+                if (!cmpPosition.null() && cmpPosition->IsInWorld())
+                    sourcePos = CVector3D(cmpPosition->GetPosition());
+            }
+
+            group->PlayNext(sourcePos);
         }
-
-        group->PlayNext(sourcePos);
     }
 };