(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
@@ -29,6 +29,10 @@ namespace Barotrauma
            drawPos.Y = -drawPos.Y;

            Color clr = currentHull == null ? Color.Blue : Color.White;
+            if (isObstructed)
+            {
+                clr = Color.Black;
+            }
            if (IsSelected) clr = Color.Red;
            if (IsHighlighted) clr = Color.DarkRed;

@@ -50,7 +54,7 @@ namespace Barotrauma
                GUI.DrawLine(spriteBatch,
                    drawPos,
                    new Vector2(e.DrawPosition.X, -e.DrawPosition.Y),
-                    Color.Green, width: 5);
+                    isObstructed ? Color.Gray : Color.Green, width: 5);
            }

            GUI.SmallFont.DrawString(spriteBatch,