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

Use TargetType.Invalid checks instead of IsValidFor

Browse Source
This commit is contained in:
reaperrr
2020-05-08 15:08:50 +02:00
committed by abcdefg30
parent 978c69d0c3
commit a68467292e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
View File

@@ -102,10 +102,10 @@ namespace OpenRA.Mods.Common.Warheads
public override void DoImpact(Target target, WarheadArgs args) public override void DoImpact(Target target, WarheadArgs args)
{ {
var firedBy = args.SourceActor; if (target.Type == TargetType.Invalid)
if (!target.IsValidFor(firedBy))
return; return;
var firedBy = args.SourceActor;
var pos = target.CenterPosition; var pos = target.CenterPosition;
var world = firedBy.World; var world = firedBy.World;
var targetTile = world.Map.CellContaining(pos); var targetTile = world.Map.CellContaining(pos);

4
OpenRA.Mods.Common/Warheads/FireClusterWarhead.cs
View File

@@ -46,10 +46,10 @@ namespace OpenRA.Mods.Common.Warheads
public override void DoImpact(Target target, WarheadArgs args) public override void DoImpact(Target target, WarheadArgs args)
{ {
var firedBy = args.SourceActor; if (target.Type == TargetType.Invalid)
if (!target.IsValidFor(firedBy))
return; return;
var firedBy = args.SourceActor;
var map = firedBy.World.Map; var map = firedBy.World.Map;
var targetCell = map.CellContaining(target.CenterPosition); var targetCell = map.CellContaining(target.CenterPosition);

4
OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs
View File

@@ -31,10 +31,10 @@ namespace OpenRA.Mods.Common.Warheads
public override void DoImpact(Target target, WarheadArgs args) public override void DoImpact(Target target, WarheadArgs args)
{ {
var firedBy = args.SourceActor; if (target.Type == TargetType.Invalid)
if (!target.IsValidFor(firedBy))
return; return;
var firedBy = args.SourceActor;
var world = firedBy.World; var world = firedBy.World;
if (Chance < world.LocalRandom.Next(100)) if (Chance < world.LocalRandom.Next(100))