From 4de0d0fcb99b1d58b190d9d88418383dc3181536 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 7 Oct 2018 17:23:56 +0200
Subject: [PATCH] Replace LaunchEffect with updated SpriteEffect

---
 OpenRA.Mods.Common/Effects/LaunchEffect.cs   | 57 --------------------
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj |  1 -
 OpenRA.Mods.Common/Projectiles/LaserZap.cs   |  2 +-
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 OpenRA.Mods.Common/Effects/LaunchEffect.cs

diff --git a/OpenRA.Mods.Common/Effects/LaunchEffect.cs b/OpenRA.Mods.Common/Effects/LaunchEffect.cs
deleted file mode 100644
index 417da065fe..0000000000
--- a/OpenRA.Mods.Common/Effects/LaunchEffect.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2018 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;
-using System.Collections.Generic;
-using OpenRA.Effects;
-using OpenRA.Graphics;
-
-namespace OpenRA.Mods.Common.Effects
-{
-	public class LaunchEffect : IEffect, ISpatiallyPartitionable
-	{
-		readonly World world;
-		readonly Animation anim;
-		readonly string palette;
-		WPos pos;
-		Func<WPos> posFunc;
-
-		public LaunchEffect(World world, string image, string sequence, string palette)
-			: this(world, () => WPos.Zero, () => 0, image, sequence, palette) { }
-
-		public LaunchEffect(World world, Func<WPos> posFunc, Func<int> facingFunc, string image, string sequence, string palette)
-		{
-			this.world = world;
-			this.posFunc = posFunc;
-			this.palette = palette;
-
-			anim = new Animation(world, image, facingFunc);
-			anim.PlayThen(sequence, () => world.AddFrameEndTask(w => { w.Remove(this); w.ScreenMap.Remove(this); }));
-			pos = posFunc();
-			world.ScreenMap.Add(this, pos, anim.Image);
-		}
-
-		public void Tick(World world)
-		{
-			anim.Tick();
-			pos = posFunc();
-			world.ScreenMap.Update(this, pos, anim.Image);
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr)
-		{
-			if (world.FogObscures(pos))
-				return SpriteRenderable.None;
-
-			return anim.Render(pos, wr.Palette(palette));
-		}
-	}
-}
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 50a7e39e2a..10c321241b 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -148,7 +148,6 @@
     <Compile Include="Effects\SpriteEffect.cs" />
     <Compile Include="FileFormats\Png.cs" />
     <Compile Include="Graphics\RailgunRenderable.cs" />
-    <Compile Include="Effects\LaunchEffect.cs" />
     <Compile Include="Lint\CheckNotifications.cs" />
     <Compile Include="Projectiles\AreaBeam.cs" />
     <Compile Include="Projectiles\Bullet.cs" />
diff --git a/OpenRA.Mods.Common/Projectiles/LaserZap.cs b/OpenRA.Mods.Common/Projectiles/LaserZap.cs
index 8a3e5c3db6..a079f9f34e 100644
--- a/OpenRA.Mods.Common/Projectiles/LaserZap.cs
+++ b/OpenRA.Mods.Common/Projectiles/LaserZap.cs
@@ -140,7 +140,7 @@ namespace OpenRA.Mods.Common.Projectiles
 			source = args.CurrentSource();
 
 			if (hasLaunchEffect && ticks == 0)
-				world.AddFrameEndTask(w => w.Add(new LaunchEffect(world, args.CurrentSource, args.CurrentMuzzleFacing,
+				world.AddFrameEndTask(w => w.Add(new SpriteEffect(args.CurrentSource, args.CurrentMuzzleFacing, world,
 					info.LaunchEffectImage, info.LaunchEffectSequence, info.LaunchEffectPalette)));
 
 			// Beam tracks target