From 3fbb81b4fc223e6223c6e1f3c78771227d6b3be5 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue, 22 May 2012 19:19:49 +1200
Subject: [PATCH] remove more spurious trait lookups in RenderCargo

---
 OpenRA.Mods.Cnc/RenderCargo.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Cnc/RenderCargo.cs b/OpenRA.Mods.Cnc/RenderCargo.cs
index 8a7a29009a..874c73edfc 100644
--- a/OpenRA.Mods.Cnc/RenderCargo.cs
+++ b/OpenRA.Mods.Cnc/RenderCargo.cs
@@ -24,18 +24,20 @@ namespace OpenRA.Mods.Cnc
 	{
 		Cargo cargo;
 		IFacing facing;
+		IHasLocation location;
 
 		public RenderCargo(Actor self)
 		{
 			cargo = self.Trait<Cargo>();
 			facing = self.TraitOrDefault<IFacing>();
+			location = self.Trait<IHasLocation>();
 		}
 
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
 		{
 			foreach (var c in cargo.Passengers)
 			{
-				c.Trait<ITeleportable>().SetPxPosition( c, self.Trait<IHasLocation>().PxPosition );
+				c.Trait<ITeleportable>().SetPxPosition( c, location.PxPosition );
 
 				var cargoFacing = c.TraitOrDefault<IFacing>();
 				if (facing != null && cargoFacing != null)