From 2b3e116f74f50def3b59cf4759b71ded52c7a75a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 19 Mar 2014 13:43:56 +1300 Subject: [PATCH] Remove RenderLandingCraft dependency on Mobile. --- OpenRA.Mods.RA/Render/RenderLandingCraft.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.RA/Render/RenderLandingCraft.cs b/OpenRA.Mods.RA/Render/RenderLandingCraft.cs index 782c5c624d..64d9b2a7fb 100644 --- a/OpenRA.Mods.RA/Render/RenderLandingCraft.cs +++ b/OpenRA.Mods.RA/Render/RenderLandingCraft.cs @@ -14,7 +14,7 @@ using OpenRA.Mods.RA.Move; namespace OpenRA.Mods.RA.Render { - public class RenderLandingCraftInfo : RenderUnitInfo + public class RenderLandingCraftInfo : RenderUnitInfo, Requires { public readonly string[] OpenTerrainTypes = { "Clear" }; public readonly string OpenAnim = "open"; @@ -25,26 +25,24 @@ namespace OpenRA.Mods.RA.Render public class RenderLandingCraft : RenderUnit { + readonly RenderLandingCraftInfo info; readonly Actor self; readonly Cargo cargo; - readonly RenderLandingCraftInfo info; + readonly IMove move; bool open; public RenderLandingCraft(Actor self, RenderLandingCraftInfo info) : base(self) { + this.info = info; this.self = self; cargo = self.Trait(); - this.info = info; + move = self.Trait(); } public bool ShouldBeOpen() { - var mobile = self.TraitOrDefault(); - if (mobile == null) - return false; - - if (self.CenterPosition.Z > 0 || mobile.IsMoving) + if (self.CenterPosition.Z > 0 || move.IsMoving) return false; return cargo.CurrentAdjacentCells