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

Merge pull request #8046 from obrakmann/fix_missing_infantry_in_legacy_editor

Browse Source 
Fix missing infantry in the legacy editor
This commit is contained in:
Matthias Mailänder
2015-04-27 21:28:43 +02:00
parent f9fa5cc9b0 22cd68e8f9
commit 4e950024d3
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
{
public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, ILegacyEditorRenderInfo, Requires<IBodyOrientationInfo>
public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, Requires<IBodyOrientationInfo>
{
public readonly string Sequence = "idle";
@@ -37,9 +37,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

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);
}
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