Fixed hulls not being linked to gaps if the center of the gap is exactly at the edge of the adjacent hulls.

Closes #147
2017-12-13 21:07:51 +02:00
parent 847e10d4a2
commit cce2cf942d
3 changed files with 22 additions and 11 deletions
@@ -491,10 +491,18 @@ namespace Barotrauma
            return new Rectangle((int)pos.X, (int)pos.Y, (int)size.X, (int)size.Y);
        }

-        public static bool RectContains(Rectangle rect, Vector2 pos)
+        public static bool RectContains(Rectangle rect, Vector2 pos, bool inclusive = false)
        {
-            return (pos.X > rect.X && pos.X < rect.X + rect.Width
-                && pos.Y < rect.Y && pos.Y > rect.Y - rect.Height);
+            if (inclusive)
+            {
+                return (pos.X >= rect.X && pos.X <= rect.X + rect.Width
+                    && pos.Y <= rect.Y && pos.Y >= rect.Y - rect.Height);
+            }
+            else
+            {
+                return (pos.X > rect.X && pos.X < rect.X + rect.Width
+                    && pos.Y < rect.Y && pos.Y > rect.Y - rect.Height);
+            }
        }

        public static bool RectsOverlap(Rectangle rect1, Rectangle rect2, bool inclusive=true)