diff --git a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs index 717e47b8f7..03ac1082ff 100644 --- a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs @@ -204,7 +204,6 @@ namespace OpenRA.Mods.Common.Orders { new FactionInit(faction), new OwnerInit(queue.Actor.Owner), - new HideBibPreviewInit() }; foreach (var api in actor.TraitInfos()) diff --git a/OpenRA.Mods.Common/Traits/Buildings/Bib.cs b/OpenRA.Mods.Common/Traits/Buildings/Bib.cs index 867c31ed72..23a9d72804 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/Bib.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/Bib.cs @@ -17,7 +17,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { - public class BibInfo : ITraitInfo, Requires, IRenderActorPreviewSpritesInfo, Requires + public class BibInfo : ITraitInfo, Requires, IRenderActorPreviewSpritesInfo, IActorPreviewInitInfo, Requires { [SequenceReference] public readonly string Sequence = "bib"; [PaletteReference] public readonly string Palette = TileSet.TerrainPaletteInternalName; @@ -64,6 +64,11 @@ namespace OpenRA.Mods.Common.Traits yield return new SpriteActorPreview(anim, () => offset, () => -(offset.Y + centerOffset.Y + 512), p, rs.Scale); } } + + IEnumerable IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) + { + yield return new HideBibPreviewInit(); + } } public class Bib : INotifyAddedToWorld, INotifyRemovedFromWorld @@ -120,7 +125,7 @@ namespace OpenRA.Mods.Common.Traits } } - public class HideBibPreviewInit : IActorInit, ISuppressInitExport + class HideBibPreviewInit : IActorInit, ISuppressInitExport { [FieldFromYamlKey] readonly bool value = true; public HideBibPreviewInit() { } diff --git a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs index 2ef06a2f28..210318c5f3 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs @@ -30,7 +30,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic var actor = world.Map.Rules.Actors[actorType]; var td = new TypeDictionary(); - td.Add(new HideBibPreviewInit()); td.Add(new OwnerInit(world.WorldActor.Owner)); td.Add(new FactionInit(world.WorldActor.Owner.PlayerReference.Faction)); foreach (var api in actor.TraitInfos()) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs index e85878bc6c..41d77c62e6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs @@ -106,7 +106,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic var td = new TypeDictionary(); td.Add(new FacingInit(92)); td.Add(new TurretFacingInit(92)); - td.Add(new HideBibPreviewInit()); td.Add(new OwnerInit(selectedOwner.Name)); td.Add(new FactionInit(selectedOwner.Faction)); foreach (var api in actor.TraitInfos())