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

Merge remote-tracking branch 'pchote/cleanup'

Browse Source
This commit is contained in:
Chris Forbes
2013-02-28 08:45:47 +13:00
parent 817e6f1ec1 3a11aeb434
commit 3ab4112631
104 changed files with 659 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Missions/Allies04Script.cs
View File

@@ -17,6 +17,7 @@ using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Render;
using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Widgets;
@@ -489,19 +490,21 @@ namespace OpenRA.Mods.RA.Missions
public override object Create(ActorInitializer init) { return new Allies04RenderHijacked(init.self, this); }
}
class Allies04RenderHijacked : RenderUnit, IRenderModifier
class Allies04RenderHijacked : RenderUnit
{
Allies04Hijackable hijackable;
Allies04RenderHijackedInfo info;
public Allies04RenderHijacked(Actor self, Allies04RenderHijackedInfo info)
: base(self)
{
this.info = info;
hijackable = self.Trait<Allies04Hijackable>();
}
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
protected override string PaletteName(Actor self)
{
return r.Select(a => a.WithPalette(Palette(hijackable.OldOwner)));
return info.Palette ?? info.PlayerPalette + hijackable.OldOwner.InternalName;
}
}