Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/Characters/Character.cs Subsurface/Source/GUI/GUI.cs Subsurface/Source/GUI/LoadingScreen.cs
2017-02-13 22:04:28 +02:00
parent bfc22c7b33 1ea3044fd6
commit 7f7ac76484
17 changed files with 137 additions and 17 deletions
@@ -1588,6 +1588,8 @@ namespace Barotrauma
            Vector2 closestItemPos = closestItem != null ? closestItem.DrawPosition : Vector2.Zero;
            closestItemPos.Y = -closestItemPos.Y;
            GUI.DrawLine(spriteBatch, closestItemPos - new Vector2(0, 5), closestItemPos + new Vector2(0, 5), Color.Lime, 0, 10);
+
+            if (this == controlled || GUI.DisableHUD) return;
            
            Vector2 pos = DrawPosition;
            pos.Y = -pos.Y;
@@ -1601,7 +1603,6 @@ namespace Barotrauma

            if (this == controlled) return;

-
            if (info != null)
            {
                Vector2 namePos = new Vector2(pos.X, pos.Y - 110.0f - (5.0f / cam.Zoom)) - GUI.Font.MeasureString(Info.Name) * 0.5f / cam.Zoom;