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

Remove PaletteReference.FromName from PBOG.

Browse Source
This commit is contained in:
Paul Chote
2013-02-26 09:31:19 +13:00
parent f890ea010e
commit 6fc4807a10
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -21,20 +21,17 @@ namespace OpenRA.Mods.RA.Orders
{ {
readonly Actor Producer; readonly Actor Producer;
readonly string Building; readonly string Building;
readonly IEnumerable<Renderable> Preview;
readonly BuildingInfo BuildingInfo; readonly BuildingInfo BuildingInfo;
IEnumerable<Renderable> preview;
Sprite buildOk, buildBlocked; Sprite buildOk, buildBlocked;
bool initialized = false;
public PlaceBuildingOrderGenerator(Actor producer, string name) public PlaceBuildingOrderGenerator(Actor producer, string name)
{ {
Producer = producer; Producer = producer;
Building = name; Building = name;
BuildingInfo = Rules.Info[Building].Traits.Get<BuildingInfo>(); BuildingInfo = Rules.Info[Building].Traits.Get<BuildingInfo>();
var rbi = Rules.Info[Building].Traits.Get<RenderBuildingInfo>();
var pr = PaletteReference.FromName(rbi.Palette ?? (producer.Owner != null ?
rbi.PlayerPalette + producer.Owner.InternalName : null));
Preview = rbi.RenderPreview(Rules.Info[Building], pr);
buildOk = SequenceProvider.GetSequence("overlay", "build-valid").GetSprite(0); buildOk = SequenceProvider.GetSequence("overlay", "build-valid").GetSprite(0);
buildBlocked = SequenceProvider.GetSequence("overlay", "build-invalid").GetSprite(0); buildBlocked = SequenceProvider.GetSequence("overlay", "build-invalid").GetSprite(0);
} }
@@ -90,7 +87,17 @@ namespace OpenRA.Mods.RA.Orders
} }
else else
{ {
foreach (var r in Preview) if (!initialized)
{
var rbi = Rules.Info[Building].Traits.Get<RenderBuildingInfo>();
var palette = rbi.Palette ?? (Producer.Owner != null ?
rbi.PlayerPalette + Producer.Owner.InternalName : null);
preview = rbi.RenderPreview(Rules.Info[Building], wr.Palette(palette));
initialized = true;
}
foreach (var r in preview)
r.Sprite.DrawAt(topLeft.ToPPos().ToFloat2() + r.Pos, r.Sprite.DrawAt(topLeft.ToPPos().ToFloat2() + r.Pos,
r.Palette.RowIndex(wr), r.Palette.RowIndex(wr),
r.Scale*r.Sprite.size); r.Scale*r.Sprite.size);