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

Add missing EnabledByDefault checks to WithSpriteBodyInfo subclasses.

Browse Source
This commit is contained in:
Paul Chote
2018-08-10 18:25:18 +01:00
committed by reaperrr
parent 0b53c1f139
commit d110a21bfe
6 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs
View File

@@ -27,6 +27,9 @@ namespace OpenRA.Mods.Cnc.Traits.Render
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p) public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{ {
if (!EnabledByDefault)
yield break;
var t = init.Actor.TraitInfos<TurretedInfo>().FirstOrDefault(); var t = init.Actor.TraitInfos<TurretedInfo>().FirstOrDefault();
var wsb = init.Actor.TraitInfos<WithSpriteBodyInfo>().FirstOrDefault(); var wsb = init.Actor.TraitInfos<WithSpriteBodyInfo>().FirstOrDefault();

3
OpenRA.Mods.Common/Traits/Render/WithBridgeSpriteBody.cs
View File

@@ -44,6 +44,9 @@ namespace OpenRA.Mods.Common.Traits.Render
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p) public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{ {
if (!EnabledByDefault)
yield break;
var anim = new Animation(init.World, image); var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequences.First()), () => 0); anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequences.First()), () => 0);

3
OpenRA.Mods.Common/Traits/Render/WithDeadBridgeSpriteBody.cs
View File

@@ -49,6 +49,9 @@ namespace OpenRA.Mods.Common.Traits.Render
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p) public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{ {
if (!EnabledByDefault)
yield break;
var anim = new Animation(init.World, image); var anim = new Animation(init.World, image);
var sequence = init.World.Type == WorldType.Editor ? EditorSequence : Sequence; var sequence = init.World.Type == WorldType.Editor ? EditorSequence : Sequence;
var palette = init.World.Type == WorldType.Editor ? init.WorldRenderer.Palette(EditorPalette) : p; var palette = init.World.Type == WorldType.Editor ? init.WorldRenderer.Palette(EditorPalette) : p;

3
OpenRA.Mods.Common/Traits/Render/WithFacingSpriteBody.cs
View File

@@ -23,6 +23,9 @@ namespace OpenRA.Mods.Common.Traits.Render
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p) public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{ {
if (!EnabledByDefault)
yield break;
var anim = new Animation(init.World, image, init.GetFacing()); var anim = new Animation(init.World, image, init.GetFacing());
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence)); anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));

3
OpenRA.Mods.Common/Traits/Render/WithGateSpriteBody.cs
View File

@@ -33,6 +33,9 @@ namespace OpenRA.Mods.Common.Traits.Render
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p) public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{ {
if (!EnabledByDefault)
yield break;
var anim = new Animation(init.World, image); var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0); anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);

3
OpenRA.Mods.Common/Traits/Render/WithWallSpriteBody.cs
View File

@@ -33,6 +33,9 @@ namespace OpenRA.Mods.Common.Traits.Render
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p) public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{ {
if (!EnabledByDefault)
yield break;
var adjacent = 0; var adjacent = 0;
if (init.Contains<RuntimeNeighbourInit>()) if (init.Contains<RuntimeNeighbourInit>())