diff --git a/OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs index 7fe28579de..0abcedfafd 100644 --- a/OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs @@ -34,11 +34,6 @@ namespace OpenRA.Mods.RA [Desc("What impact types should this effect NOT apply to.", "Overrides ValidImpactTypes.")] public readonly ImpactType InvalidImpactTypes = ImpactType.None; - public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) - { - DoImpact(target.CenterPosition, firedBy, firepowerModifier); - } - public static ImpactType GetImpactType(World world, CPos cell, WPos pos) { var isAir = pos.Z > 0; @@ -79,8 +74,9 @@ namespace OpenRA.Mods.RA return false; } - public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier) + public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) { + var pos = target.CenterPosition; var world = firedBy.World; var targetTile = world.Map.CellContaining(pos); var isValid = IsValidImpact(pos, firedBy); diff --git a/OpenRA.Mods.RA/Warheads/CreateResourceWarhead.cs b/OpenRA.Mods.RA/Warheads/CreateResourceWarhead.cs index 86743323ce..cd088f7b84 100644 --- a/OpenRA.Mods.RA/Warheads/CreateResourceWarhead.cs +++ b/OpenRA.Mods.RA/Warheads/CreateResourceWarhead.cs @@ -27,17 +27,12 @@ namespace OpenRA.Mods.RA // TODO: Allow maximum resource splatter to be defined. (Per tile, and in total). public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) - { - DoImpact(target.CenterPosition, firedBy, firepowerModifier); - } - - public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier) { if (string.IsNullOrEmpty(AddsResourceType)) return; var world = firedBy.World; - var targetTile = world.Map.CellContaining(pos); + var targetTile = world.Map.CellContaining(target.CenterPosition); var resLayer = world.WorldActor.Trait(); var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0; diff --git a/OpenRA.Mods.RA/Warheads/DestroyResourceWarhead.cs b/OpenRA.Mods.RA/Warheads/DestroyResourceWarhead.cs index 4bde5a3693..bd4048a9d1 100644 --- a/OpenRA.Mods.RA/Warheads/DestroyResourceWarhead.cs +++ b/OpenRA.Mods.RA/Warheads/DestroyResourceWarhead.cs @@ -24,14 +24,9 @@ namespace OpenRA.Mods.RA // TODO: Allow maximum resource removal to be defined. (Per tile, and in total). public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) - { - DoImpact(target.CenterPosition, firedBy, firepowerModifier); - } - - public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier) { var world = firedBy.World; - var targetTile = world.Map.CellContaining(pos); + var targetTile = world.Map.CellContaining(target.CenterPosition); var resLayer = world.WorldActor.Trait(); var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0; diff --git a/OpenRA.Mods.RA/Warheads/LeaveSmudgeWarhead.cs b/OpenRA.Mods.RA/Warheads/LeaveSmudgeWarhead.cs index 2b051f5555..27bc6e4096 100644 --- a/OpenRA.Mods.RA/Warheads/LeaveSmudgeWarhead.cs +++ b/OpenRA.Mods.RA/Warheads/LeaveSmudgeWarhead.cs @@ -26,14 +26,9 @@ namespace OpenRA.Mods.RA public readonly string[] SmudgeType = { }; public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) - { - DoImpact(target.CenterPosition, firedBy, firepowerModifier); - } - - public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier) { var world = firedBy.World; - var targetTile = world.Map.CellContaining(pos); + var targetTile = world.Map.CellContaining(target.CenterPosition); var smudgeLayers = world.WorldActor.TraitsImplementing().ToDictionary(x => x.Info.Type); var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;