(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -112,6 +112,7 @@ namespace Barotrauma
            List<Vector2> positions = new List<Vector2>();
            foreach (var allowedPosition in availablePositions)
            {
+                if (Level.Loaded.ExtraWalls.Any(w => w.Cells.Any(c => c.IsPointInside(allowedPosition.Position.ToVector2())))) { continue; }
                positions.Add(allowedPosition.Position.ToVector2());
            }