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

Remove hardcoded references to HideBibPreviewInit.

Browse Source
This commit is contained in:
Paul Chote
2017-06-28 18:16:41 +01:00
committed by RoosterDragon
parent b2c3a55c12
commit 2a2bd676a3
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -204,7 +204,6 @@ namespace OpenRA.Mods.Common.Orders
{ {
new FactionInit(faction), new FactionInit(faction),
new OwnerInit(queue.Actor.Owner), new OwnerInit(queue.Actor.Owner),
new HideBibPreviewInit()
}; };
foreach (var api in actor.TraitInfos<IActorPreviewInitInfo>()) foreach (var api in actor.TraitInfos<IActorPreviewInitInfo>())

9
OpenRA.Mods.Common/Traits/Buildings/Bib.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class BibInfo : ITraitInfo, Requires<BuildingInfo>, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo> public class BibInfo : ITraitInfo, Requires<BuildingInfo>, IRenderActorPreviewSpritesInfo, IActorPreviewInitInfo, Requires<RenderSpritesInfo>
{ {
[SequenceReference] public readonly string Sequence = "bib"; [SequenceReference] public readonly string Sequence = "bib";
[PaletteReference] public readonly string Palette = TileSet.TerrainPaletteInternalName; [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); yield return new SpriteActorPreview(anim, () => offset, () => -(offset.Y + centerOffset.Y + 512), p, rs.Scale);
} }
} }
IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
{
yield return new HideBibPreviewInit();
}
} }
public class Bib : INotifyAddedToWorld, INotifyRemovedFromWorld public class Bib : INotifyAddedToWorld, INotifyRemovedFromWorld
@@ -120,7 +125,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public class HideBibPreviewInit : IActorInit<bool>, ISuppressInitExport class HideBibPreviewInit : IActorInit<bool>, ISuppressInitExport
{ {
[FieldFromYamlKey] readonly bool value = true; [FieldFromYamlKey] readonly bool value = true;
public HideBibPreviewInit() { } public HideBibPreviewInit() { }

1
OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -30,7 +30,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var actor = world.Map.Rules.Actors[actorType]; var actor = world.Map.Rules.Actors[actorType];
var td = new TypeDictionary(); var td = new TypeDictionary();
td.Add(new HideBibPreviewInit());
td.Add(new OwnerInit(world.WorldActor.Owner)); td.Add(new OwnerInit(world.WorldActor.Owner));
td.Add(new FactionInit(world.WorldActor.Owner.PlayerReference.Faction)); td.Add(new FactionInit(world.WorldActor.Owner.PlayerReference.Faction));
foreach (var api in actor.TraitInfos<IActorPreviewInitInfo>()) foreach (var api in actor.TraitInfos<IActorPreviewInitInfo>())

1
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
View File

@@ -106,7 +106,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var td = new TypeDictionary(); var td = new TypeDictionary();
td.Add(new FacingInit(92)); td.Add(new FacingInit(92));
td.Add(new TurretFacingInit(92)); td.Add(new TurretFacingInit(92));
td.Add(new HideBibPreviewInit());
td.Add(new OwnerInit(selectedOwner.Name)); td.Add(new OwnerInit(selectedOwner.Name));
td.Add(new FactionInit(selectedOwner.Faction)); td.Add(new FactionInit(selectedOwner.Faction));
foreach (var api in actor.TraitInfos<IActorPreviewInitInfo>()) foreach (var api in actor.TraitInfos<IActorPreviewInitInfo>())