Remove Owner from ActorPreviews.

This commit is contained in:
Paul Chote
2015-05-07 20:08:14 +01:00
parent d3f76f13a1
commit c0282bdff9
6 changed files with 16 additions and 13 deletions

View File

@@ -46,9 +46,9 @@ namespace OpenRA.Mods.Common.Widgets
public override Widget Clone() { return new ActorPreviewWidget(this); }
public void SetPreview(ActorInfo actor, Player owner, TypeDictionary td)
public void SetPreview(ActorInfo actor, TypeDictionary td)
{
var init = new ActorPreviewInitializer(actor, owner, worldRenderer, td);
var init = new ActorPreviewInitializer(actor, worldRenderer, td);
preview = actor.Traits.WithInterface<IRenderActorPreviewInfo>()
.SelectMany(rpi => rpi.RenderPreview(init))
.ToArray();

View File

@@ -30,8 +30,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var td = new TypeDictionary();
td.Add(new HideBibPreviewInit());
preview.SetPreview(actor, world.WorldActor.Owner, td);
td.Add(new OwnerInit(world.WorldActor.Owner));
td.Add(new RaceInit(world.WorldActor.Owner.PlayerReference.Race));
preview.SetPreview(actor, td);
var hueSlider = widget.Get<SliderWidget>("HUE");
var mixer = widget.Get<ColorMixerWidget>("MIXER");