From a642b8298e056e62f3ec634b53c3a84103b2dff1 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Mon, 15 Jul 2013 19:48:51 +1200
Subject: [PATCH] Move harvester animation z offset to sequences.

---
 OpenRA.Mods.RA/Render/WithHarvestAnimation.cs | 5 +----
 mods/d2k/rules/vehicles.yaml                  | 1 -
 mods/d2k/sequences.yaml                       | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs b/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs
index 81c10a6455..7ce6a4a44e 100644
--- a/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs
+++ b/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs
@@ -24,9 +24,6 @@ namespace OpenRA.Mods.RA.Render
 		[Desc("Position relative to body")]
 		public readonly WVec Offset = WVec.Zero;
 
-		[Desc("Additional draw-order offset")]
-		public readonly int ZOffset = 0;
-
 		public object Create(ActorInitializer init) { return new WithHarvestAnimation(init.self, this); }
 	}
 
@@ -47,7 +44,7 @@ namespace OpenRA.Mods.RA.Render
 			rs.anims.Add("harvest_{0}".F(info.Sequence), new AnimationWithOffset(anim,
 				() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
 				() => !visible,
-			    p => WithTurret.ZOffsetFromCenter(self, p, info.ZOffset)));
+			    p => WithTurret.ZOffsetFromCenter(self, p, 0)));
 		}
 
 		public void Harvested(Actor self, ResourceType resource)
diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml
index e81f07ae29..675f66817b 100644
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -89,7 +89,6 @@ HARVESTER:
 	LeavesHusk:
 		HuskActor: Harvester.Husk
 	WithHarvestAnimation:
-		ZOffset: 1
 
 HARVESTER.Husk:
 	Inherits: ^Husk
diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml
index 6bec54887a..22ced8b342 100644
--- a/mods/d2k/sequences.yaml
+++ b/mods/d2k/sequences.yaml
@@ -72,6 +72,7 @@ harvester:
 		Length: 6
 		Facings: 8
 		Tick: 80
+		ZOffset: 1
 	dock: unload2
 		Start: 0
 		Length: 10