epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing infantry in the legacy editor

Browse Source 
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.
This commit is contained in:
Oliver Brakmann
2015-04-27 17:52:14 +02:00
parent db170f75e5
commit 22cd68e8f9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Render/RenderSimple.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, ILegacyEditorRenderInfo, Requires<IBodyOrientationInfo> public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, Requires<IBodyOrientationInfo>
{ {
public readonly string Sequence = "idle"; public readonly string Sequence = "idle";
@@ -36,9 +36,6 @@ namespace OpenRA.Mods.Common.Traits
{ {
return sequenceProvider.GetSequence(GetImage(ai, sequenceProvider, race), Sequence).Facings; 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 public class RenderSimple : RenderSprites, IAutoSelectionSize

5
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p); IEnumerable<IActorPreview> 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.")] [Desc("The sequence name that defines the actor sprites. Defaults to the actor name.")]
public readonly string Image = null; public readonly string Image = null;
@@ -83,6 +83,9 @@ namespace OpenRA.Mods.Common.Traits
return (Image ?? actor.Name).ToLowerInvariant(); 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 public class RenderSprites : IRender, ITick, INotifyOwnerChanged, INotifyEffectiveOwnerChanged