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

Restrict IActorPreviewInitInfo to ActorInit.

Browse Source
This commit is contained in:
Paul Chote
2020-05-30 18:15:55 +01:00
committed by reaperrr
parent b856613194
commit ae7cfa56b7
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Render/WithBuildingBib.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Cnc.Traits
} }
} }
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) IEnumerable<ActorInit> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{ {
yield return new HideBibPreviewInit(); yield return new HideBibPreviewInit();
} }

2
OpenRA.Mods.Cnc/Traits/TDGunboat.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Cnc.Traits
public int GetInitialFacing() { return InitialFacing; } public int GetInitialFacing() { return InitialFacing; }
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) IEnumerable<ActorInit> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{ {
yield return new FacingInit(PreviewFacing); yield return new FacingInit(PreviewFacing);
} }

2
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -150,7 +150,7 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new Aircraft(init, this); } public override object Create(ActorInitializer init) { return new Aircraft(init, this); }
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) IEnumerable<ActorInit> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{ {
yield return new FacingInit(PreviewFacing); yield return new FacingInit(PreviewFacing);
} }

2
OpenRA.Mods.Common/Traits/Husk.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Facing to use for actor previews (map editor, color picker, etc)")] [Desc("Facing to use for actor previews (map editor, color picker, etc)")]
public readonly int PreviewFacing = 96; public readonly int PreviewFacing = 96;
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) IEnumerable<ActorInit> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{ {
yield return new FacingInit(PreviewFacing); yield return new FacingInit(PreviewFacing);
} }

2
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Boolean expression defining the condition under which this actor cannot be nudged by other actors.")] [Desc("Boolean expression defining the condition under which this actor cannot be nudged by other actors.")]
public readonly BooleanExpression ImmovableCondition = null; public readonly BooleanExpression ImmovableCondition = null;
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) IEnumerable<ActorInit> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{ {
yield return new FacingInit(PreviewFacing); yield return new FacingInit(PreviewFacing);
} }

2
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Display order for the turret facing slider in the map editor")] [Desc("Display order for the turret facing slider in the map editor")]
public readonly int EditorTurretFacingDisplayOrder = 4; public readonly int EditorTurretFacingDisplayOrder = 4;
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) IEnumerable<ActorInit> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{ {
// HACK: The ActorInit system does not support multiple instances of the same type // HACK: The ActorInit system does not support multiple instances of the same type
// Make sure that we only return one TurretFacingInit, even for actors with multiple turrets // Make sure that we only return one TurretFacingInit, even for actors with multiple turrets

2
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -400,7 +400,7 @@ namespace OpenRA.Mods.Common.Traits
[RequireExplicitImplementation] [RequireExplicitImplementation]
public interface IActorPreviewInitInfo : ITraitInfoInterface public interface IActorPreviewInitInfo : ITraitInfoInterface
{ {
IEnumerable<object> ActorPreviewInits(ActorInfo ai, ActorPreviewType type); IEnumerable<ActorInit> ActorPreviewInits(ActorInfo ai, ActorPreviewType type);
} }
public interface IMove public interface IMove