From 22cd68e8f958ff3719bf46d29ad847e689362d6f Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Mon, 27 Apr 2015 17:52:14 +0200 Subject: [PATCH] Fix missing infantry in the legacy editor The editor is looking for actor types that implement ILegacyEditorRender, but infantry units don't anymore since #7638. This moves ILegacyEditorRender to the root of the Render* inheritance tree, so that all actor types have access to it. --- OpenRA.Mods.Common/Traits/Render/RenderSimple.cs | 5 +---- OpenRA.Mods.Common/Traits/Render/RenderSprites.cs | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Render/RenderSimple.cs b/OpenRA.Mods.Common/Traits/Render/RenderSimple.cs index 80fd682124..6a90dcb75b 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderSimple.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderSimple.cs @@ -16,7 +16,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { - public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, ILegacyEditorRenderInfo, Requires + public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, Requires { public readonly string Sequence = "idle"; @@ -36,9 +36,6 @@ namespace OpenRA.Mods.Common.Traits { return sequenceProvider.GetSequence(GetImage(ai, sequenceProvider, race), Sequence).Facings; } - - public string EditorPalette { get { return Palette; } } - public string EditorImage(ActorInfo actor, SequenceProvider sequenceProvider, string race) { return GetImage(actor, sequenceProvider, race); } } public class RenderSimple : RenderSprites, IAutoSelectionSize diff --git a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs index 62e5b56e75..0188e887d0 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits IEnumerable RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p); } - public class RenderSpritesInfo : IRenderActorPreviewInfo, ITraitInfo + public class RenderSpritesInfo : IRenderActorPreviewInfo, ITraitInfo, ILegacyEditorRenderInfo { [Desc("The sequence name that defines the actor sprites. Defaults to the actor name.")] public readonly string Image = null; @@ -83,6 +83,9 @@ namespace OpenRA.Mods.Common.Traits return (Image ?? actor.Name).ToLowerInvariant(); } + + public string EditorPalette { get { return Palette; } } + public string EditorImage(ActorInfo actor, SequenceProvider sequenceProvider, string race) { return GetImage(actor, sequenceProvider, race); } } public class RenderSprites : IRender, ITick, INotifyOwnerChanged, INotifyEffectiveOwnerChanged