(f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-06-12 16:45:24 +03:00
parent dce98349ea
commit adab8589da
14 changed files with 119 additions and 78 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)