From 586d5ec11e438f7729a8c3a365157966aaf4fdfd Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 20 May 2010 19:19:28 +1200
Subject: [PATCH] housekeeping

---
 OpenRA.Game/OpenRA.Game.csproj                |  3 +-
 OpenRA.Game/Orders/UnitOrderGenerator.cs      |  1 -
 OpenRA.Game/Traits/Attack/AttackInfo.cs       | 33 -------------------
 OpenRA.Game/Traits/{Attack => }/AttackBase.cs |  1 -
 OpenRA.Game/Traits/TraitsInterfaces.cs        |  9 +++++
 5 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 OpenRA.Game/Traits/Attack/AttackInfo.cs
 rename OpenRA.Game/Traits/{Attack => }/AttackBase.cs (96%)
 mode change 100755 => 100644

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index df699b8915..999cd8ac3d 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -185,8 +185,7 @@
     <Compile Include="Graphics\TerrainRenderer.cs" />
     <Compile Include="Traits\Activities\Move.cs" />
     <Compile Include="Traits\Activities\Turn.cs" />
-    <Compile Include="Traits\Attack\AttackBase.cs" />
-    <Compile Include="Traits\Attack\AttackInfo.cs" />
+    <Compile Include="Traits\AttackBase.cs" />
     <Compile Include="Traits\Modifiers\BelowUnits.cs" />
     <Compile Include="Traits\Buildable.cs" />
     <Compile Include="Traits\Building.cs" />
diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index 208432a8e5..2da5b60b31 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -22,7 +22,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Support;
 
 namespace OpenRA.Orders
 {
diff --git a/OpenRA.Game/Traits/Attack/AttackInfo.cs b/OpenRA.Game/Traits/Attack/AttackInfo.cs
deleted file mode 100644
index 90cbdf2877..0000000000
--- a/OpenRA.Game/Traits/Attack/AttackInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it 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.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using OpenRA.GameRules;
-
-namespace OpenRA.Traits
-{
-	public class AttackInfo
-	{
-		public Actor Attacker;
-		public WarheadInfo Warhead;
-		public int Damage;
-		public DamageState DamageState;
-		public bool DamageStateChanged;
-	}
-}
diff --git a/OpenRA.Game/Traits/Attack/AttackBase.cs b/OpenRA.Game/Traits/AttackBase.cs
old mode 100755
new mode 100644
similarity index 96%
rename from OpenRA.Game/Traits/Attack/AttackBase.cs
rename to OpenRA.Game/Traits/AttackBase.cs
index 2ea16f65da..d3a20173d3
--- a/OpenRA.Game/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Game/Traits/AttackBase.cs
@@ -20,7 +20,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 30db372366..4fdf2a6bcc 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -32,6 +32,15 @@ namespace OpenRA.Traits
 	public enum TagType { None, Fake, Primary };
 	public enum Stance { Enemy, Neutral, Ally };
 
+	public class AttackInfo
+	{
+		public Actor Attacker;
+		public WarheadInfo Warhead;
+		public int Damage;
+		public DamageState DamageState;
+		public bool DamageStateChanged;
+	}
+
 	public interface ITick { void Tick(Actor self); }
 	public interface IRender { IEnumerable<Renderable> Render(Actor self); }
 	public interface IIssueOrder { Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor ); }