From 81113e07a63010a6bef328a487575f3967ea1a41 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 19 Nov 2016 16:58:50 +0000
Subject: [PATCH] Remove WithDecorationCarryable.

---
 OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj        |  1 -
 .../Traits/Render/WithDecorationCarryable.cs  | 39 -------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 OpenRA.Mods.D2k/Traits/Render/WithDecorationCarryable.cs

diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
index 50c76c26fc..f009a0f900 100644
--- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
@@ -85,7 +85,6 @@
     <Compile Include="Warheads\ChangeOwnerWarhead.cs" />
     <Compile Include="UtilityCommands\D2kMapImporter.cs" />
     <Compile Include="UtilityCommands\ImportD2kMapCommand.cs" />
-    <Compile Include="Traits\Render\WithDecorationCarryable.cs" />
     <Compile Include="Traits\World\D2kEditorResourceLayer.cs" />
     <Compile Include="Lint\CheckImportActors.cs" />
   </ItemGroup>
diff --git a/OpenRA.Mods.D2k/Traits/Render/WithDecorationCarryable.cs b/OpenRA.Mods.D2k/Traits/Render/WithDecorationCarryable.cs
deleted file mode 100644
index 9bf9dfd984..0000000000
--- a/OpenRA.Mods.D2k/Traits/Render/WithDecorationCarryable.cs
+++ /dev/null
@@ -1,39 +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 OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Traits.Render;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.D2k.Traits.Render
-{
-	[Desc("Displays a sprite when the carryable actor is waiting for pickup.")]
-	public class WithDecorationCarryableInfo : WithDecorationInfo, Requires<CarryableInfo>
-	{
-		public override object Create(ActorInitializer init) { return new WithDecorationCarryable(init.Self, this); }
-	}
-
-	public class WithDecorationCarryable : WithDecoration
-	{
-		readonly Carryable carryable;
-
-		public WithDecorationCarryable(Actor self, WithDecorationCarryableInfo info)
-			: base(self, info)
-		{
-			carryable = self.Trait<Carryable>();
-		}
-
-		protected override bool ShouldRender(Actor self)
-		{
-			return carryable.Reserved && base.ShouldRender(self);
-		}
-	}
-}