Clear Sky: Crash when some weapons(eg. wpn_val) with built in suppres…

…sor don't have snd_silncer_shot only snd_shoot
OpenXRay · May 21, 2024 · 4295c9d · 4295c9d
1 parent f3383c2
commit 4295c9d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp
@@ -90,7 +90,7 @@ void CWeaponMagazined::Load(LPCSTR section)
     m_sSndShotCurrent = "sndShot";
 
     //звуки и партиклы глушителя, если такой есть
-    if (m_eSilencerStatus == ALife::eAddonAttachable || m_eSilencerStatus == ALife::eAddonPermanent)
+    if ((m_eSilencerStatus == ALife::eAddonAttachable || m_eSilencerStatus == ALife::eAddonPermanent) && WeaponSoundExist(section, "snd_silncer_shot"))
     {
         if (pSettings->line_exist(section, "silencer_flame_particles"))
             m_sSilencerFlameParticles = pSettings->r_string(section, "silencer_flame_particles");
@@ -1065,7 +1065,7 @@ void CWeaponMagazined::InitAddons()
         }
     }
 
-    if (IsSilencerAttached() /* && SilencerAttachable() */)
+    if (IsSilencerAttached() && WeaponSoundExist(cNameSect().c_str(), "snd_silncer_shot"))
     {
         m_sFlameParticlesCurrent = m_sSilencerFlameParticles;
         m_sSmokeParticlesCurrent = m_sSilencerSmokeParticles;