v0.19.8.0

2022-09-28 21:30:52 -03:00
parent fec8131243
commit 3ca584f2fc
152 changed files with 1931 additions and 1071 deletions
@@ -324,6 +324,8 @@ namespace Barotrauma.Items.Components
            int i = 0;
            foreach (Item containedItem in Inventory.AllItems)
            {
+                if (containedItem?.Sprite == null) { continue; }
+
                if (AutoInteractWithContained)
                {
                    containedItem.IsHighlighted = item.IsHighlighted;
@@ -344,7 +346,7 @@ namespace Barotrauma.Items.Components
                containedItem.Sprite.Draw(
                    spriteBatch,
                    new Vector2(currentItemPos.X, -currentItemPos.Y),
-                    isWiringMode ? containedItem.GetSpriteColor() * 0.15f : containedItem.GetSpriteColor(),
+                    isWiringMode ? containedItem.GetSpriteColor(withHighlight: true) * 0.15f : containedItem.GetSpriteColor(withHighlight: true),
                    origin,
                    -(containedItem.body == null ? 0.0f : containedItem.body.DrawRotation ),
                    containedItem.Scale,