From de224a381d643ea50cdfc0adf74e039b9bd2a19b Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 18 Dec 2014 13:23:58 +0100
Subject: [PATCH] Make WithRotor independent from WithTurret

Move WithRotor to Mods.Common
---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj          |  1 +
 .../Traits}/Render/WithRotor.cs                       | 11 ++++++++---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                  |  1 -
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithRotor.cs (91%)
 mode change 100755 => 100644

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 1d84308a23..b3e0b7bb02 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -162,6 +162,7 @@
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
     <Compile Include="Traits\Render\WithResources.cs" />
+    <Compile Include="Traits\Render\WithRotor.cs" />
     <Compile Include="Traits\Render\WithShadow.cs" />
     <Compile Include="Traits\Render\WithSmoke.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />
diff --git a/OpenRA.Mods.RA/Render/WithRotor.cs b/OpenRA.Mods.Common/Traits/Render/WithRotor.cs
old mode 100755
new mode 100644
similarity index 91%
rename from OpenRA.Mods.RA/Render/WithRotor.cs
rename to OpenRA.Mods.Common/Traits/Render/WithRotor.cs
index 78dc4da03f..e1ac419f1e
--- a/OpenRA.Mods.RA/Render/WithRotor.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithRotor.cs
@@ -12,10 +12,9 @@ using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Displays a helicopter rotor overlay.")]
 	public class WithRotorInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
@@ -64,7 +63,7 @@ namespace OpenRA.Mods.RA.Render
 			rotorAnim.PlayRepeating(info.Sequence);
 			rs.Add(info.Id, new AnimationWithOffset(rotorAnim,
 				() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
-				null, () => false, p => WithTurret.ZOffsetFromCenter(self, p, 1)));
+				null, () => false, p => ZOffsetFromCenter(self, p, 1)));
 		}
 
 		public void Tick(Actor self)
@@ -75,5 +74,11 @@ namespace OpenRA.Mods.RA.Render
 
 			rotorAnim.ReplaceAnim(isFlying ? info.Sequence : info.GroundSequence);
 		}
+
+		static public int ZOffsetFromCenter(Actor self, WPos pos, int offset)
+		{
+			var delta = self.CenterPosition - pos;
+			return delta.Y + delta.Z + offset;
+		}
 	}
 }
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 62f6595828..1112c60346 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -239,7 +239,6 @@
     <Compile Include="Render\RenderLandingCraft.cs" />
     <Compile Include="Render\WithBuildingExplosion.cs" />
     <Compile Include="Render\WithMuzzleFlash.cs" />
-    <Compile Include="Render\WithRotor.cs" />
     <Compile Include="Repairable.cs" />
     <Compile Include="RepairableNear.cs" />
     <Compile Include="ScaredyCat.cs" />