From 87537d9669355736929fa139001cc1ff652a0c67 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 10 Jun 2016 17:33:20 +0200
Subject: [PATCH] Move WithAttackOverlay to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                | 1 +
 .../Traits/Render/WithAttackOverlay.cs                      | 6 ++----
 OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj                      | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/Render/WithAttackOverlay.cs (89%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 42565c99f5..aa2b5be2ab 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -428,6 +428,7 @@
     <Compile Include="Traits\Render\WithSpriteBarrel.cs" />
     <Compile Include="Traits\Render\WithBuildingExplosion.cs" />
     <Compile Include="Traits\Render\WithAttackAnimation.cs" />
+    <Compile Include="Traits\Render\WithAttackOverlay.cs" />
     <Compile Include="Traits\Render\WithMoveAnimation.cs" />
     <Compile Include="Traits\Render\WithSiloAnimation.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
diff --git a/OpenRA.Mods.D2k/Traits/Render/WithAttackOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithAttackOverlay.cs
similarity index 89%
rename from OpenRA.Mods.D2k/Traits/Render/WithAttackOverlay.cs
rename to OpenRA.Mods.Common/Traits/Render/WithAttackOverlay.cs
index f4004bac5c..a838d5a638 100644
--- a/OpenRA.Mods.D2k/Traits/Render/WithAttackOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithAttackOverlay.cs
@@ -10,11 +10,9 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits.Render
+namespace OpenRA.Mods.Common.Traits.Render
 {
 	[Desc("Rendered together with an attack.")]
 	public class WithAttackOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>
@@ -52,7 +50,7 @@ namespace OpenRA.Mods.D2k.Traits.Render
 				info.Palette, info.IsPlayerPalette);
 		}
 
-		public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
+		void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
 		{
 			attacking = true;
 			overlay.PlayThen(info.Sequence, () => attacking = false);
diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
index 2fb1091836..1f1107c965 100644
--- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
@@ -98,7 +98,6 @@
     <Compile Include="Warheads\ChangeOwnerWarhead.cs" />
     <Compile Include="UtilityCommands\D2kMapImporter.cs" />
     <Compile Include="UtilityCommands\ImportD2kMapCommand.cs" />
-    <Compile Include="Traits\Render\WithAttackOverlay.cs" />
     <Compile Include="Traits\Render\WithDecorationCarryable.cs" />
     <Compile Include="Traits\World\D2kEditorResourceLayer.cs" />
     <Compile Include="Lint\CheckImportActors.cs" />