diff --git a/OpenRA.Game/GameRules/ActorInfo.cs b/OpenRA.Game/GameRules/ActorInfo.cs index 2666ee402a..afb2cd6adc 100644 --- a/OpenRA.Game/GameRules/ActorInfo.cs +++ b/OpenRA.Game/GameRules/ActorInfo.cs @@ -28,7 +28,7 @@ namespace OpenRA /// You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait. /// public readonly string Name; - public readonly TypeDictionary Traits = new TypeDictionary(); + readonly TypeDictionary traits = new TypeDictionary(); List constructOrderCache = null; public ActorInfo(string name, MiniYaml node, Dictionary allUnits) @@ -52,7 +52,7 @@ namespace OpenRA if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@")) try { - Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value)); + traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value)); } catch (FieldLoader.MissingFieldsException e) { @@ -71,7 +71,7 @@ namespace OpenRA { Name = name; foreach (var t in traitInfos) - Traits.Add(t); + traits.Add(t); } static Dictionary GetParents(MiniYaml node, Dictionary allUnits) @@ -128,7 +128,7 @@ namespace OpenRA if (constructOrderCache != null) return constructOrderCache; - var source = Traits.WithInterface().Select(i => new + var source = traits.WithInterface().Select(i => new { Trait = i, Type = i.GetType(), @@ -179,7 +179,7 @@ namespace OpenRA public IEnumerable> GetInitKeys() { - var inits = Traits.WithInterface().SelectMany( + var inits = traits.WithInterface().SelectMany( t => t.GetType().GetInterfaces() .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>)) .Select(i => i.GetGenericArguments()[0])).ToList(); @@ -191,9 +191,9 @@ namespace OpenRA i.Name.Replace("Init", ""), i)); } - public bool HasTraitInfo() where T : ITraitInfo { return Traits.Contains(); } - public T TraitInfo() where T : ITraitInfo { return Traits.Get(); } - public T TraitInfoOrDefault() where T : ITraitInfo { return Traits.GetOrDefault(); } - public IEnumerable TraitInfos() where T : ITraitInfo { return Traits.WithInterface(); } + public bool HasTraitInfo() where T : ITraitInfo { return traits.Contains(); } + public T TraitInfo() where T : ITraitInfo { return traits.Get(); } + public T TraitInfoOrDefault() where T : ITraitInfo { return traits.GetOrDefault(); } + public IEnumerable TraitInfos() where T : ITraitInfo { return traits.WithInterface(); } } }