(d9829ac) v0.9.4.0

2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -92,7 +92,7 @@ namespace Barotrauma.Items.Components
            chargeIndicator.Color = ToolBox.GradientLerp(chargeRatio, Color.Red, Color.Orange, Color.Green);
        }

-        public void Draw(SpriteBatch spriteBatch, bool editing = false)
+        public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
        {
            if (indicatorSize.X <= 1.0f || indicatorSize.Y <= 1.0f) return;

@@ -143,7 +143,10 @@ namespace Barotrauma.Items.Components
            float rechargeRate = msg.ReadRangedInteger(0, 10) / 10.0f;
            RechargeSpeed = rechargeRate * MaxRechargeSpeed;
 #if CLIENT
-            rechargeSpeedSlider.BarScroll = rechargeRate;
+            if (rechargeSpeedSlider != null)
+            {
+                rechargeSpeedSlider.BarScroll = rechargeRate;
+            }
 #endif
            Charge = msg.ReadRangedSingle(0.0f, 1.0f, 8) * capacity;
        }