From 555d4f4adcaee66bce2237a2505a900a777f51f2 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 23 May 2016 23:07:34 +0200
Subject: [PATCH] Remove Corpse effect and use SpriteEffect instead

---
 OpenRA.Mods.Common/Effects/Corpse.cs          | 44 -------------------
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj  |  1 -
 .../Traits/Render/WithDeathAnimation.cs       |  2 +-
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 OpenRA.Mods.Common/Effects/Corpse.cs

diff --git a/OpenRA.Mods.Common/Effects/Corpse.cs b/OpenRA.Mods.Common/Effects/Corpse.cs
deleted file mode 100644
index 740779e751..0000000000
--- a/OpenRA.Mods.Common/Effects/Corpse.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Effects;
-using OpenRA.Graphics;
-
-namespace OpenRA.Mods.Common.Effects
-{
-	public class Corpse : IEffect
-	{
-		readonly World world;
-		readonly WPos pos;
-		readonly string paletteName;
-		readonly Animation anim;
-
-		public Corpse(World world, WPos pos, string image, string sequence, string paletteName)
-		{
-			this.world = world;
-			this.pos = pos;
-			this.paletteName = paletteName;
-			anim = new Animation(world, image);
-			anim.PlayThen(sequence, () => world.AddFrameEndTask(w => w.Remove(this)));
-		}
-
-		public void Tick(World world) { anim.Tick(); }
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr)
-		{
-			if (world.FogObscures(pos))
-				return SpriteRenderable.None;
-
-			return anim.Render(pos, wr.Palette(paletteName));
-		}
-	}
-}
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 31a6d70103..615fe1b703 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -150,7 +150,6 @@
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Contrail.cs" />
     <Compile Include="Effects\ContrailFader.cs" />
-    <Compile Include="Effects\Corpse.cs" />
     <Compile Include="Effects\CrateEffect.cs" />
     <Compile Include="Effects\FloatingText.cs" />
     <Compile Include="Effects\GravityBomb.cs" />
diff --git a/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs
index e44ab7c130..7633d97fd9 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs
@@ -108,7 +108,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		public void SpawnDeathAnimation(Actor self, WPos pos, string image, string sequence, string palette)
 		{
-			self.World.AddFrameEndTask(w => w.Add(new Corpse(w, pos, image, sequence, palette)));
+			self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, w, image, sequence, palette)));
 		}
 
 		void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses)