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

Improve some actor queries.

Browse Source 
Use ActorsWithTrait if possible to avoid querying all actors in the world.
This commit is contained in:
RoosterDragon
2015-10-25 01:19:29 +01:00
parent e0177d7798
commit 30aee56d78
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Activities/Hunt.cs
View File

@@ -23,8 +23,9 @@ namespace OpenRA.Mods.Common.Activities
public Hunt(Actor self) public Hunt(Actor self)
{ {
var attack = self.Trait<AttackBase>(); var attack = self.Trait<AttackBase>();
targets = self.World.Actors.Where(a => self != a && !a.IsDead && a.IsInWorld && a.AppearsHostileTo(self) targets = self.World.ActorsWithTrait<Huntable>().Select(p => p.Actor).Where(
&& a.Info.HasTraitInfo<HuntableInfo>() && IsTargetable(a, self) && attack.HasAnyValidWeapons(Target.FromActor(a))); a => self != a && !a.IsDead && a.IsInWorld && a.AppearsHostileTo(self)
&& IsTargetable(a, self) && attack.HasAnyValidWeapons(Target.FromActor(a)));
} }
bool IsTargetable(Actor self, Actor viewer) bool IsTargetable(Actor self, Actor viewer)

4
OpenRA.Mods.Common/Traits/World/BridgeLayer.cs
View File

@@ -53,8 +53,8 @@ namespace OpenRA.Mods.Common.Traits
ConvertBridgeToActor(w, cell); ConvertBridgeToActor(w, cell);
// Link adjacent (long)-bridges so that artwork is updated correctly // Link adjacent (long)-bridges so that artwork is updated correctly
foreach (var b in w.Actors.SelectMany(a => a.TraitsImplementing<Bridge>())) foreach (var p in w.ActorsWithTrait<Bridge>())
b.LinkNeighbouringBridges(w, this); p.Trait.LinkNeighbouringBridges(w, this);
} }
void ConvertBridgeToActor(World w, CPos cell) void ConvertBridgeToActor(World w, CPos cell)