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

remove most of the crap from queries

Browse Source
This commit is contained in:
Chris Forbes
2011-03-17 21:48:50 +13:00
parent eba7641125
commit 149324ea92
21 changed files with 113 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

3
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

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