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

Actor.traits is implementation detail

Browse Source
This commit is contained in:
Bob
2010-08-14 15:19:30 +12:00
committed by alzeih
parent f6c6255f64
commit ae703d50b2
165 changed files with 586 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -200,7 +200,7 @@ namespace OpenRA.Mods.RA.Widgets
.OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder)
.ToArray();
var queue = world.LocalPlayer.PlayerActor.traits.Get<ProductionQueue>();
var queue = world.LocalPlayer.PlayerActor.Trait<ProductionQueue>();
var overlayBits = new List<Pair<Sprite, float2>>();
numActualRows = Math.Max((allBuildables.Length + Columns - 1) / Columns, Rows);
@@ -338,7 +338,7 @@ namespace OpenRA.Mods.RA.Widgets
{
var player = world.LocalPlayer;
var unit = Rules.Info[item];
var queue = player.PlayerActor.traits.Get<Traits.ProductionQueue>();
var queue = player.PlayerActor.Trait<Traits.ProductionQueue>();
var eva = world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
var producing = queue.AllItems(unit.Category).FirstOrDefault( a => a.Item == item );
@@ -408,7 +408,7 @@ namespace OpenRA.Mods.RA.Widgets
var y = paletteOrigin.Y + 9;
tabs.Clear();
var queue = world.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
var queue = world.LocalPlayer.PlayerActor.Trait<Traits.ProductionQueue>();
foreach (var q in tabImageNames)
{
@@ -471,7 +471,7 @@ namespace OpenRA.Mods.RA.Widgets
buildable.Description + ((buildable.Hotkey != null)? " ({0})".F(buildable.Hotkey.ToUpper()) : ""),
p.ToInt2() + new int2(5, 5), Color.White);
var resources = pl.PlayerActor.traits.Get<PlayerResources>();
var resources = pl.PlayerActor.Trait<PlayerResources>();
DrawRightAligned("${0}".F(buildable.Cost), pos + new int2(-5, 5),
(resources.DisplayCash + resources.DisplayOre >= buildable.Cost ? Color.White : Color.Red ));

4
OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Widgets
public override void DrawInner(World world)
{
var playerResources = world.LocalPlayer.PlayerActor.traits.Get<PlayerResources>();
var playerResources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
var digitCollection = "digits-" + world.LocalPlayer.Country.Race;
var chromeCollection = "chrome-" + world.LocalPlayer.Country.Race;
@@ -74,7 +74,7 @@ namespace OpenRA.Mods.RA.Widgets
}
public override bool HandleInputInner(MouseInput mi)
{
{
if (mi.Event == MouseInputEvent.Down)
{
var action = buttons.Where(a => a.First.Contains(mi.Location.ToPoint()))

12
OpenRA.Mods.RA/Widgets/PowerBinWidget.cs
View File

@@ -6,11 +6,11 @@
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
using System;
#endregion
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Widgets;
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Widgets
{
powerCollection = "power-" + world.LocalPlayer.Country.Race;
var resources = world.LocalPlayer.PlayerActor.traits.Get<PlayerResources>();
var resources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
// Nothing to draw
if (resources.PowerProvided == 0
@@ -83,4 +83,4 @@ namespace OpenRA.Mods.RA.Widgets
Game.Renderer.RgbaSpriteRenderer.Flush();
}
}
}
}

2
OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs
View File

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.RA.Widgets
{
buttons.Clear();
var powers = world.LocalPlayer.PlayerActor.traits.WithInterface<SupportPower>();
var powers = world.LocalPlayer.PlayerActor.TraitsImplementing<SupportPower>();
var numPowers = powers.Count(p => p.IsAvailable);
if (numPowers == 0) return;
var rectBounds = RenderBounds;