epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 2422; tesla ignoring weapon offset

Browse Source
This commit is contained in:
Chris Forbes
2012-10-07 19:23:50 +13:00
parent 3e81a4bd70
commit f337c7fb40
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Combat.cs
View File

@@ -233,18 +233,21 @@ namespace OpenRA.Mods.RA
+ turret.ScreenSpacePosition); + turret.ScreenSpacePosition);
} }
// gets the screen-space position of a barrel. static PVecInt GetUnitspaceBarrelOffset(Actor self, IFacing facing, Turret turret, Barrel barrel)
public static PVecInt GetBarrelPosition(Actor self, IFacing facing, Turret turret, Barrel barrel)
{ {
var turreted = self.TraitOrDefault<Turreted>(); var turreted = self.TraitOrDefault<Turreted>();
if (turreted == null && facing == null) if (turreted == null && facing == null)
return PVecInt.Zero; return PVecInt.Zero;
var turretFacing = turreted != null ? turreted.turretFacing : facing.Facing; var turretFacing = turreted != null ? turreted.turretFacing : facing.Facing;
return (PVecInt)(PVecFloat)Util.RotateVectorByFacing(barrel.TurretSpaceOffset.ToFloat2(), turretFacing, .7f);
}
// gets the screen-space position of a barrel.
public static PVecInt GetBarrelPosition(Actor self, IFacing facing, Turret turret, Barrel barrel)
{
return GetTurretPosition(self, facing, turret) + barrel.ScreenSpaceOffset return GetTurretPosition(self, facing, turret) + barrel.ScreenSpaceOffset
+ (PVecInt)(PVecFloat)Util.RotateVectorByFacing(barrel.TurretSpaceOffset.ToFloat2(), turretFacing, .7f); + GetUnitspaceBarrelOffset(self, facing, turret, barrel);
} }
public static bool IsInRange( PPos attackOrigin, float range, Actor target ) public static bool IsInRange( PPos attackOrigin, float range, Actor target )