From 79f3f04c3bb149fc21b91d2d8d447871207d8718 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 1 Jan 2018 15:00:12 +0200 Subject: [PATCH] Fixed Steering components never setting their currPowerConsumption field above zero, making them cause zero load on the electrical grid. --- .../Source/Items/Components/Machines/Steering.cs | 4 +++- .../Source/Items/Components/Machines/Steering.cs | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs index c3bacaa8b..bfdbba14a 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs @@ -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) { diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs index b648347cc..00326b53b 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs @@ -98,7 +98,6 @@ namespace Barotrauma.Items.Components : base(item, element) { IsActive = true; - InitProjSpecific(); } @@ -128,8 +127,10 @@ namespace Barotrauma.Items.Components unsentChanges = false; } } - - if (voltage < minVoltage && powerConsumption > 0.0f) return; + + currPowerConsumption = powerConsumption; + + if (voltage < minVoltage && currPowerConsumption > 0.0f) return; ApplyStatusEffects(ActionType.OnActive, deltaTime, null);