(c15419d90) Changelog additions + merge fix

2019-04-08 19:18:20 +03:00
parent 4811ec796f
commit 3877c18d0c
6 changed files with 34 additions and 32 deletions
@@ -207,7 +207,7 @@ namespace Barotrauma
                        PathSteering.SteeringManual(deltaTime, Vector2.UnitX * MathHelper.Clamp(speed, 0.25f, 1));
                        PathSteering.WanderAngle = 0.0f;
                    }
-                    else
+                    else if (rightDist < WallAvoidDistance)
                    {
                        float speed = (WallAvoidDistance - rightDist) / WallAvoidDistance;
                        PathSteering.SteeringManual(deltaTime, -Vector2.UnitX * MathHelper.Clamp(speed, 0.25f, 1));
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Barotrauma.Extensions;

 namespace Barotrauma
 {