(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
@@ -39,10 +39,14 @@ namespace Barotrauma
                else if (Entity is Item)
                {
                    color = Color.CadetBlue;
+                    // disable the indicators for items, because they clutter the debug view
+                    return;
                }
                else
                {
                    color = Color.WhiteSmoke;
+                    // disable the indicators for structures, because they clutter the debug view
+                    return;
                }
                ShapeExtensions.DrawCircle(spriteBatch, pos, SightRange, 100, color, thickness: 1 / Screen.Selected.Cam.Zoom);
                ShapeExtensions.DrawCircle(spriteBatch, pos, 6, 8, color, thickness: 2 / Screen.Selected.Cam.Zoom);