(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -692,7 +692,7 @@ namespace Barotrauma
            ImpactProjSpecific(impact, f1.Body);
        }
        
-        public void SeverLimbJoint(LimbJoint limbJoint)
+        public void SeverLimbJoint(LimbJoint limbJoint, bool playSound = true)
        {
            if (!limbJoint.CanBeSevered || limbJoint.IsSevered)
            {
@@ -721,7 +721,7 @@ namespace Barotrauma
            }
        }

-        partial void SeverLimbJointProjSpecific(LimbJoint limbJoint);
+        partial void SeverLimbJointProjSpecific(LimbJoint limbJoint, bool playSound = true);

        private void GetConnectedLimbs(List<Limb> connectedLimbs, List<LimbJoint> checkedJoints, Limb limb)
        {