More HashSet trait fields & Lint support

This commit is contained in:
atlimit8
2015-09-05 15:54:00 -05:00
parent e74c0d6c13
commit 8250f223c4
57 changed files with 115 additions and 89 deletions

View File

@@ -8,6 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
@@ -17,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
public class ProximityCaptorInfo : ITraitInfo
{
[FieldLoader.Require]
public readonly string[] Types = { };
public readonly HashSet<string> Types = new HashSet<string>();
public object Create(ActorInitializer init) { return new ProximityCaptor(this); }
}
@@ -27,9 +28,9 @@ namespace OpenRA.Mods.Common.Traits
public ProximityCaptor(ProximityCaptorInfo info) { Info = info; }
public bool HasAny(string[] typesList)
public bool HasAny(IEnumerable<string> typesList)
{
return typesList.Any(flag => Info.Types.Contains(flag));
return Info.Types.Overlaps(typesList);
}
}
}