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

Combine IHasLocation -> IOccupySpace, IMove -> ITeleportable.

Browse Source
This commit is contained in:
Paul Chote
2013-07-21 10:44:07 +12:00
parent 36a45d1a3f
commit ecc119cb29
31 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Armament.cs
View File

@@ -99,7 +99,7 @@ namespace OpenRA.Mods.RA
// Note: facing is only used by the legacy positioning code
// The world coordinate model uses Actor.Orientation
public void CheckFire(Actor self, AttackBase attack, IMove move, IFacing facing, Target target)
public void CheckFire(Actor self, AttackBase attack, IFacing facing, Target target)
{
if (FireDelay > 0) return;
@@ -120,7 +120,7 @@ namespace OpenRA.Mods.RA
return;
var barrel = Barrels[Burst % Barrels.Length];
var destMove = target.IsActor ? target.Actor.TraitOrDefault<IMove>() : null;
var destios = target.IsActor ? target.Actor.TraitOrDefault<IOccupySpace>() : null;
var muzzlePosition = self.CenterPosition + MuzzleOffset(self, barrel);
var legacyMuzzlePosition = PPos.FromWPos(muzzlePosition);
@@ -136,7 +136,7 @@ namespace OpenRA.Mods.RA
srcAltitude = legacyMuzzleAltitude,
dest = target.CenterLocation,
destAltitude = destMove != null ? destMove.Altitude : 0,
destAltitude = destios != null ? destios.Altitude : 0,
facing = legacyFacing,