(4b33eda28) Merge branch 'dev' into enemy-ai

2019-03-25 19:49:34 +02:00
parent 7d74b5bd52
commit 26594e2c6c
31 changed files with 207 additions and 148 deletions
@@ -785,8 +785,9 @@ namespace Barotrauma.Items.Components

                foreach (Limb limb in c.AnimController.Limbs)
                {
-                    float pointDist = ((limb.WorldPosition - pingSource) * displayScale).LengthSquared();
+                    if (!limb.body.Enabled) { continue; }

+                    float pointDist = ((limb.WorldPosition - pingSource) * displayScale).LengthSquared();
                    if (limb.SimPosition == Vector2.Zero || pointDist > DisplayRadius * DisplayRadius) continue;

                    if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)