From 362c97ce0559f470c9253c91bc0aff835d0428ad Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 6 Aug 2018 11:01:13 +0300 Subject: [PATCH] Worn items use the spritecolor set in the sub editor. Closes #574 --- Barotrauma/BarotraumaClient/Source/Characters/Limb.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs index 6bf04257c..274d8f309 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs @@ -194,10 +194,11 @@ namespace Barotrauma } } + Color wearableColor = wearable.WearableComponent.Item.GetSpriteColor(); wearable.Sprite.Draw(spriteBatch, new Vector2(body.DrawPosition.X, -body.DrawPosition.Y), - color, origin, - -body.DrawRotation, + new Color((color.R * wearableColor.R) / 255.0f, (color.G * wearableColor.G) / 255.0f, (color.B * wearableColor.B) / 255.0f, (color.A * wearableColor.A) / 255.0f), + origin, -body.DrawRotation, Scale, spriteEffect, depth); }