(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -415,7 +415,7 @@ namespace Barotrauma
            }
        }

-        partial void SeverLimbJointProjSpecific(LimbJoint limbJoint)
+        partial void SeverLimbJointProjSpecific(LimbJoint limbJoint, bool playSound = true)
        {
            foreach (Limb limb in new Limb[] { limbJoint.LimbA, limbJoint.LimbB })
            {
@@ -433,6 +433,11 @@ namespace Barotrauma
                    character.CurrentHull?.AddDecal(character.BloodDecalName, limb.WorldPosition, MathHelper.Clamp(limb.Mass, 0.5f, 2.0f));
                }
            }
+
+            if (playSound)
+            {
+                SoundPlayer.PlayDamageSound("Gore", 1.0f, limbJoint.LimbA.body);
+            }
        }

        public virtual void Draw(SpriteBatch spriteBatch, Camera cam)