Merge remote-tracking branch 'upstream/master' into develop

2024-06-18 12:19:13 -03:00
parent 60d0a8d453 230d1b6e78
commit e163f7ed73
263 changed files with 7788 additions and 2849 deletions
@@ -761,11 +761,12 @@ namespace Barotrauma
            hull2.Oxygen -= deltaOxygen;
        }

-        public static Gap FindAdjacent(IEnumerable<Gap> gaps, Vector2 worldPos, float allowedOrthogonalDist)
+        public static Gap FindAdjacent(IEnumerable<Gap> gaps, Vector2 worldPos, float allowedOrthogonalDist, bool allowRoomToRoom = false)
        {
            foreach (Gap gap in gaps)
            {
-                if (gap.Open == 0.0f || gap.IsRoomToRoom) { continue; }
+                if (gap.Open == 0.0f) { continue; }
+                if (gap.IsRoomToRoom && !allowRoomToRoom) { continue; }

                if (gap.ConnectedWall != null)
                {