From 342ef2a498fb9a93355e9b5fa65f7890d18c3e0b Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 20 May 2010 17:47:12 +1200
Subject: [PATCH] removed SquishByTank

---
 OpenRA.Game/OpenRA.Game.csproj     |  1 -
 OpenRA.Game/Traits/Bridge.cs       |  2 +-
 OpenRA.Game/Traits/SquishByTank.cs | 58 ------------------------------
 mods/aftermath/rules.yaml          |  4 ---
 mods/cnc/defaults.yaml             |  1 -
 mods/ra/defaults.yaml              |  1 -
 6 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 OpenRA.Game/Traits/SquishByTank.cs

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 54fc1f72e4..bbde75d4b5 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -241,7 +241,6 @@
     <Compile Include="Traits\Repairable.cs" />
     <Compile Include="Traits\Reservable.cs" />
     <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\SquishByTank.cs" />
     <Compile Include="Traits\Plane.cs" />
     <Compile Include="Traits\Player\ProductionQueue.cs" />
     <Compile Include="Traits\ProductionSurround.cs" />
diff --git a/OpenRA.Game/Traits/Bridge.cs b/OpenRA.Game/Traits/Bridge.cs
index 678f458d19..29692867dc 100644
--- a/OpenRA.Game/Traits/Bridge.cs
+++ b/OpenRA.Game/Traits/Bridge.cs
@@ -22,8 +22,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.Graphics;
 using OpenRA.GameRules;
+using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {
diff --git a/OpenRA.Game/Traits/SquishByTank.cs b/OpenRA.Game/Traits/SquishByTank.cs
deleted file mode 100644
index 8ae94fc37b..0000000000
--- a/OpenRA.Game/Traits/SquishByTank.cs
+++ /dev/null
@@ -1,58 +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
-{
-	class SquishByTankInfo : ITraitInfo
-	{
-		public object Create(Actor self) { return new SquishByTank(self); }
-	}
-
-	class SquishByTank : ICrushable
-	{
-		readonly Actor self;
-		public SquishByTank(Actor self)
-		{
-			this.self = self;
-		}
-
-		public void OnCrush(Actor crusher)
-		{
-			// ... this wasnt working ANYWAY ...
-			// self.InflictDamage(crusher, self.Health, Rules.WarheadInfo["Crush"]);
-		}
-		
-		public bool IsPathableCrush(UnitMovementType umt, Player player)
-		{
-			return IsCrushableBy(umt, player);
-		}
-		
-		public bool IsCrushableBy(UnitMovementType umt, Player player)
-		{
-			if (player == self.Owner) return false;
-			switch (umt)
-			{
-				case UnitMovementType.Track: return true;
-				default: return false;
-			}
-		}
-	}
-}
diff --git a/mods/aftermath/rules.yaml b/mods/aftermath/rules.yaml
index bc39d6f09e..2c15b685e9 100644
--- a/mods/aftermath/rules.yaml
+++ b/mods/aftermath/rules.yaml
@@ -137,7 +137,6 @@ SHOK:
 	AttackBase:
 		PrimaryWeapon: PortaTesla
 	TakeCover:
-	-SquishByTank:
 
 MECH:
 	Inherits: ^Infantry
@@ -178,7 +177,6 @@ ANT1:
 		PrimaryWeapon: Mandible
 	RenderInfantry:
 		Image: ANT1
-	-SquishByTank:
 	-Passenger:
  
 ANT2:
@@ -198,7 +196,6 @@ ANT2:
 		PrimaryWeapon: FireballLauncher
 	RenderInfantry:
 		Image: ANT2
-	-SquishByTank:
 	-Passenger:
  
 ANT3:
@@ -218,5 +215,4 @@ ANT3:
 		PrimaryWeapon: TeslaZap
 	RenderInfantry:
 		Image: ANT3
-	-SquishByTank:
 	-Passenger:
\ No newline at end of file
diff --git a/mods/cnc/defaults.yaml b/mods/cnc/defaults.yaml
index c751ae2adf..2b3606cd7b 100644
--- a/mods/cnc/defaults.yaml
+++ b/mods/cnc/defaults.yaml
@@ -22,7 +22,6 @@
 		MovementType: Foot
 	Selectable:
 	RenderInfantry:
-	SquishByTank:
 	AutoTarget:
 	Passenger:
 	HiddenUnderFog:
diff --git a/mods/ra/defaults.yaml b/mods/ra/defaults.yaml
index e2da44cf79..2b762e5640 100644
--- a/mods/ra/defaults.yaml
+++ b/mods/ra/defaults.yaml
@@ -22,7 +22,6 @@
 		MovementType: Foot
 	Selectable:
 	RenderInfantry:
-	SquishByTank:
 	AutoTarget:
 	Passenger:
 	HiddenUnderFog: