(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix

2019-06-15 20:24:01 +03:00
parent f68c16d944
commit 87a0ee21eb
52 changed files with 497 additions and 983 deletions
@@ -449,12 +449,11 @@ namespace Barotrauma
            {
                float depth = ActiveSprite.Depth - 0.0000015f;

-                // TODO: enable when the damage overlay textures have been remade.
-                //DamagedSprite.Draw(spriteBatch,
-                //    new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
-                //    color * Math.Min(damageOverlayStrength, 1.0f), ActiveSprite.Origin,
-                //    -body.DrawRotation,
-                //    1.0f, spriteEffect, depth);
+                DamagedSprite.Draw(spriteBatch,
+                    new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
+                    color * Math.Min(damageOverlayStrength, 1.0f), ActiveSprite.Origin,
+                    -body.DrawRotation,
+                    1.0f, spriteEffect, depth);
            }

            if (GameMain.DebugDraw)