fix local offset -> screen space transform to work as advertised

This commit is contained in:
Chris Forbes
2010-07-31 23:01:56 +12:00
parent 0b20d1366a
commit 6c6da12dd6
2 changed files with 18 additions and 8 deletions

View File

@@ -195,12 +195,6 @@ namespace OpenRA.Mods.RA
if (!w.IsValidAgainst(target)) return false;
var barrel = w.Barrels[w.Burst % w.Barrels.Length];
var fireOffset = new[] {
w.Turret.UnitSpacePosition.X + barrel.Position.X,
w.Turret.UnitSpacePosition.Y + barrel.Position.Y,
w.Turret.ScreenSpacePosition.X,
w.Turret.ScreenSpacePosition.Y }; // todo: retardage.
var destUnit = target.IsActor ? target.Actor.traits.GetOrDefault<Unit>() : null;
@@ -211,7 +205,9 @@ namespace OpenRA.Mods.RA
firedBy = self,
target = this.target,
src = self.CenterLocation.ToInt2() + Combat.GetTurretPosition(self, unit, new Turret(fireOffset)).ToInt2(),
src = (self.CenterLocation
+ Combat.GetTurretPosition(self, unit, w.Turret)
+ Combat.GetBarrelPosition(self, unit, w.Turret, barrel)).ToInt2(),
srcAltitude = unit != null ? unit.Altitude : 0,
dest = target.CenterLocation.ToInt2(),
destAltitude = destUnit != null ? destUnit.Altitude : 0,