From ccd070afd631eb7663b8ae2441996ec0363bd69a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 29 Apr 2018 04:44:36 +0200 Subject: [PATCH] Make IRenderModifier require explicit implementation --- OpenRA.Game/Traits/TraitsInterfaces.cs | 1 + OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs | 2 +- OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs | 2 +- OpenRA.Mods.Common/Traits/Render/Hovers.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 2bd53f5e0a..b3c4c737b4 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -264,6 +264,7 @@ namespace OpenRA.Traits WDist LargestBlockingActorRadius { get; } } + [RequireExplicitImplementation] public interface IRenderModifier { IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r); diff --git a/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs b/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs index d30e5148a4..b4e8d2be7d 100644 --- a/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs @@ -147,7 +147,7 @@ namespace OpenRA.Mods.Common.Traits } } - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + IEnumerable IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { return IsVisible(self, self.World.RenderPlayer) || isRendering ? r : SpriteRenderable.None; } diff --git a/OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs b/OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs index 3dc891ca25..77765ff6e3 100644 --- a/OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits public WithColoredOverlay(WithColoredOverlayInfo info) : base(info) { } - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + IEnumerable IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (IsTraitDisabled) return r; diff --git a/OpenRA.Mods.Common/Traits/Render/Hovers.cs b/OpenRA.Mods.Common/Traits/Render/Hovers.cs index 9dac304f16..61de8d65fd 100644 --- a/OpenRA.Mods.Common/Traits/Render/Hovers.cs +++ b/OpenRA.Mods.Common/Traits/Render/Hovers.cs @@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits.Render this.info = info; } - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + IEnumerable IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (self.World.Paused || IsTraitDisabled) return r;