From 315c00f67f3c113887bdcb0a35eaa2924e351677 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 19 Jul 2011 19:41:22 +1200 Subject: [PATCH] clean up Contrail trait lookups; fixes #1058 --- OpenRA.Mods.RA/Effects/Contrail.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.RA/Effects/Contrail.cs b/OpenRA.Mods.RA/Effects/Contrail.cs index 5b58587d4a..c6f1bc9a7c 100755 --- a/OpenRA.Mods.RA/Effects/Contrail.cs +++ b/OpenRA.Mods.RA/Effects/Contrail.cs @@ -31,23 +31,24 @@ namespace OpenRA.Mods.RA { ContrailInfo Info = null; Turret ContrailTurret = null; - - ContrailHistory history; + ContrailHistory history; + IFacing facing; + IMove move; public Contrail(Actor self, ContrailInfo info) { Info = info; ContrailTurret = new Turret(Info.ContrailOffset); - history = new ContrailHistory(Info.TrailLength, Info.UsePlayerColor ? ContrailHistory.ChooseColor(self) : Info.Color); + history = new ContrailHistory(Info.TrailLength, + Info.UsePlayerColor ? ContrailHistory.ChooseColor(self) : Info.Color); + facing = self.Trait(); + move = self.Trait(); } public void Tick(Actor self) { - var facing = self.Trait(); - var altitude = new float2(0, self.Trait().Altitude); - - var pos = self.CenterLocation - Combat.GetTurretPosition(self, facing, ContrailTurret) - altitude; - history.Tick(pos); + history.Tick(self.CenterLocation - new int2(0, move.Altitude) + - Combat.GetTurretPosition(self, facing, ContrailTurret)); } public void RenderAfterWorld(WorldRenderer wr, Actor self) { history.Render(self); }