queries dies

This commit is contained in:
Chris Forbes
2011-03-17 22:05:53 +13:00
parent caa52b2780
commit a3994df925
34 changed files with 52 additions and 66 deletions

View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.RA.Widgets
{
VisibleQueues.Clear();
var queues = world.Queries.WithTrait<ProductionQueue>()
var queues = world.ActorsWithTrait<ProductionQueue>()
.Where(p => p.Actor.Owner == world.LocalPlayer)
.Select(p => p.Trait);

View File

@@ -165,8 +165,8 @@ namespace OpenRA.Mods.RA.Widgets
int updateTicks = 0;
public override void Tick()
{
var hasRadarNew = world.Queries
.WithTrait<ProvidesRadar>()
var hasRadarNew = world
.ActorsWithTrait<ProvidesRadar>()
.Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive);
if (hasRadarNew != hasRadar)

View File

@@ -156,8 +156,8 @@ namespace OpenRA.Mods.RA.Widgets
int updateTicks = 0;
public override void Tick()
{
var hasRadarNew = world.Queries
.WithTrait<ProvidesRadar>()
var hasRadarNew = world
.ActorsWithTrait<ProvidesRadar>()
.Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive);
if (hasRadarNew != hasRadar)

View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.RA.Widgets
bool CycleBases()
{
var bases = World.Queries.WithTrait<BaseBuilding>()
var bases = World.ActorsWithTrait<BaseBuilding>()
.Where( a => a.Actor.Owner == World.LocalPlayer ).ToArray();
if (!bases.Any()) return true;