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

Change ImpactTypes from array to bitfield approach.

Browse Source
This commit is contained in:
reaperrr
2014-08-13 11:45:58 +02:00
parent 09b887abf2
commit ef54f011bb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -27,12 +27,13 @@ namespace OpenRA.Traits
[Flags] [Flags]
public enum ImpactType public enum ImpactType
{ {
None = 0,
Ground = 1, Ground = 1,
Water = 2, Water = 2,
Air = 4, Air = 4,
GroundHit = 8, GroundHit = 8,
WaterHit = 16, WaterHit = 16,
AirHit = 32, AirHit = 32
} }
public class AttackInfo public class AttackInfo

6
OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs
View File

@@ -29,10 +29,10 @@ namespace OpenRA.Mods.RA
public readonly string ImpactSound = null; public readonly string ImpactSound = null;
[Desc("What impact types should this effect apply to.")] [Desc("What impact types should this effect apply to.")]
public readonly ImpactType[] ValidImpactTypes = { ImpactType.Ground, ImpactType.Water, ImpactType.Air, ImpactType.GroundHit, ImpactType.WaterHit, ImpactType.AirHit }; public readonly ImpactType ValidImpactTypes = ImpactType.Ground | ImpactType.Water | ImpactType.Air | ImpactType.GroundHit | ImpactType.WaterHit | ImpactType.AirHit;
[Desc("What impact types should this effect NOT apply to.", "Overrides ValidImpactTypes.")] [Desc("What impact types should this effect NOT apply to.", "Overrides ValidImpactTypes.")]
public readonly ImpactType[] InvalidImpactTypes = { }; public readonly ImpactType InvalidImpactTypes = ImpactType.None;
public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) public override void DoImpact(Target target, Actor firedBy, float firepowerModifier)
{ {
@@ -102,7 +102,7 @@ namespace OpenRA.Mods.RA
var world = firedBy.World; var world = firedBy.World;
var targetTile = world.Map.CellContaining(pos); var targetTile = world.Map.CellContaining(pos);
var impactType = GetImpactType(world, targetTile, pos); var impactType = GetImpactType(world, targetTile, pos);
if ((!ValidImpactTypes.Contains(impactType)) || (InvalidImpactTypes.Contains(impactType))) if (!ValidImpactTypes.HasFlag(impactType) || InvalidImpactTypes.HasFlag(impactType))
return false; return false;
return true; return true;