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

queries dies

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA
[Sync] bool QueueActive = false;
public override void Tick( Actor self )
{
QueueActive = self.World.Queries.WithTrait<Production>()
QueueActive = self.World.ActorsWithTrait<Production>()
.Where(x => x.Actor.Owner == self.Owner)
.Where(x => x.Trait.Info.Produces.Contains(Info.Type))
.Any();
@@ -50,8 +50,8 @@ namespace OpenRA.Mods.RA
protected override bool BuildUnit( string name )
{
// Find a production structure to build this actor
var producers = self.World.Queries
.WithTrait<Production>()
var producers = self.World
.ActorsWithTrait<Production>()
.Where(x => x.Actor.Owner == self.Owner)
.Where(x => x.Trait.Info.Produces.Contains(Info.Type))
.OrderByDescending(x => x.Actor.IsPrimaryBuilding() ? 1 : 0 ); // prioritize the primary.

6
OpenRA.Mods.RA/Player/PlaceBuilding.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
var prevItems = GetNumBuildables(self.Owner);
// Find the queue with the target actor
var queue = w.Queries.WithTrait<ProductionQueue>()
var queue = w.ActorsWithTrait<ProductionQueue>()
.Where(p => p.Actor.Owner == self.Owner &&
p.Trait.CurrentItem() != null &&
p.Trait.CurrentItem().Item == order.TargetString &&
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.RA
if (bi == null)
return;
var producers = self.World.Queries.WithTrait<Production>()
var producers = self.World.ActorsWithTrait<Production>()
.Where( x => x.Actor.Owner == self.Owner )
.Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( bi.Queue ) )
.ToList();
@@ -110,7 +110,7 @@ namespace OpenRA.Mods.RA
{
if (p != p.World.LocalPlayer) return 0; // this only matters for local players.
return p.World.Queries.WithTrait<ProductionQueue>()
return p.World.ActorsWithTrait<ProductionQueue>()
.Where(a => a.Actor.Owner == p)
.SelectMany(a => a.Trait.BuildableItems()).Distinct().Count();
}