From 9f2e0e181fb48b4bfd3ba819a7a295f3779e5e9d Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Thu, 31 Jul 2014 22:43:37 +1200 Subject: [PATCH] Add ITraitInfo constraint to Requires --- OpenRA.Game/Traits/TraitsInterfaces.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index dc5150aaec..72b9a86610 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -121,7 +121,7 @@ namespace OpenRA.Traits public interface IRadarColorModifier { Color RadarColorOverride(Actor self); } - public interface IOccupySpaceInfo { } + public interface IOccupySpaceInfo : ITraitInfo { } public interface IOccupySpace { WPos CenterPosition { get; } @@ -167,7 +167,7 @@ namespace OpenRA.Traits void SetVisualPosition(Actor self, WPos pos); } - public interface IMoveInfo { } + public interface IMoveInfo : ITraitInfo { } public interface IMove { Activity MoveTo(CPos cell, int nearEnough); @@ -189,7 +189,7 @@ namespace OpenRA.Traits int Facing { get; set; } } - public interface IFacingInfo { int GetInitialFacing(); } + public interface IFacingInfo : ITraitInfo { int GetInitialFacing(); } public interface ICrushable { @@ -202,7 +202,7 @@ namespace OpenRA.Traits public class TraitInfo : ITraitInfo where T : new() { public virtual object Create(ActorInitializer init) { return new T(); } } - public interface Requires where T : class { } + public interface Requires where T : class, ITraitInfo { } public interface UsesInit where T : IActorInit { } public interface INotifySelected { void Selected(Actor self); } @@ -235,7 +235,7 @@ namespace OpenRA.Traits WRot QuantizeOrientation(Actor self, WRot orientation); void SetAutodetectedFacings(int facings); } - public interface IBodyOrientationInfo {} + public interface IBodyOrientationInfo : ITraitInfo { } public interface ITargetableInfo {