Merge branch 'master' into moStuff

2018-01-09 10:38:06 +02:00
parent 31350698bf 093fb12d0b
commit 7187c277e7
179 changed files with 116633 additions and 3529 deletions
@@ -90,7 +90,7 @@ namespace Barotrauma.Items.Components

            GuiFrame.Draw(spriteBatch);

-            if (voltage < minVoltage && powerConsumption > 0.0f) return;
+            if (voltage < minVoltage && currPowerConsumption > 0.0f) return;

            Rectangle velRect = new Rectangle(x + 20, y + 20, width - 40, height - 40);
            //GUI.DrawRectangle(spriteBatch, velRect, Color.White, false);
@@ -136,6 +136,8 @@ namespace Barotrauma.Items.Components
        public override void UpdateHUD(Character character)
        {
            GuiFrame.Update(1.0f / 60.0f);
+            
+            if (voltage < minVoltage && currPowerConsumption > 0.0f) return;

            if (Vector2.Distance(PlayerInput.MousePosition, new Vector2(GuiFrame.Rect.Center.X, GuiFrame.Rect.Center.Y)) < 200.0f)
            {