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

ActorMap, avoid IPositionable trait lookup.

Browse Source
This commit is contained in:
Vapre
2023-05-27 23:26:20 +02:00
committed by Matthias Mailänder
parent d72b1ffd49
commit 7c0f6ead3a
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Chronoshiftable.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Cnc.Traits
protected override void Created(Actor self) protected override void Created(Actor self)
{ {
iPositionable = self.TraitOrDefault<IPositionable>(); iPositionable = self.OccupiesSpace as IPositionable;
base.Created(self); base.Created(self);
} }

3
OpenRA.Mods.Common/Activities/Parachute.cs
View File

@@ -23,8 +23,7 @@ namespace OpenRA.Mods.Common.Activities
public Parachute(Actor self) public Parachute(Actor self)
{ {
pos = self.TraitOrDefault<IPositionable>(); pos = self.OccupiesSpace as IPositionable;
fallVector = new WVec(0, 0, self.Info.TraitInfo<ParachutableInfo>().FallRate); fallVector = new WVec(0, 0, self.Info.TraitInfo<ParachutableInfo>().FallRate);
IsInterruptible = false; IsInterruptible = false;
} }

2
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self) protected override void Created(Actor self)
{ {
facing = self.TraitOrDefault<IFacing>(); facing = self.TraitOrDefault<IFacing>();
positionable = self.TraitOrDefault<IPositionable>(); positionable = self.OccupiesSpace as IPositionable;
notifyAiming = self.TraitsImplementing<INotifyAiming>().ToArray(); notifyAiming = self.TraitsImplementing<INotifyAiming>().ToArray();
getArmaments = InitializeGetArmaments(self); getArmaments = InitializeGetArmaments(self);

5
OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs
View File

@@ -65,8 +65,7 @@ namespace OpenRA.Mods.Common.Traits
if (!info.ValidTargets.Overlaps(collector.GetEnabledTargetTypes())) if (!info.ValidTargets.Overlaps(collector.GetEnabledTargetTypes()))
return false; return false;
var positionable = collector.TraitOrDefault<IPositionable>(); if (collector.OccupiesSpace is not IPositionable positionable)
if (positionable == null)
return false; return false;
return collector.World.Map.FindTilesInCircle(collector.Location, info.MaxRadius) return collector.World.Map.FindTilesInCircle(collector.Location, info.MaxRadius)
@@ -83,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits
public override void Activate(Actor collector) public override void Activate(Actor collector)
{ {
var positionable = collector.Trait<IPositionable>(); var positionable = collector.OccupiesSpace as IPositionable;
var candidateCells = collector.World.Map.FindTilesInCircle(collector.Location, info.MaxRadius) var candidateCells = collector.World.Map.FindTilesInCircle(collector.Location, info.MaxRadius)
.Where(c => positionable.CanEnterCell(c)).Shuffle(collector.World.SharedRandom) .Where(c => positionable.CanEnterCell(c)).Shuffle(collector.World.SharedRandom)
.ToArray(); .ToArray();

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

@@ -355,8 +355,8 @@ namespace OpenRA.Mods.Common.Traits
if (checkTransient) if (checkTransient)
return true; return true;
var pos = i.Actor.TraitOrDefault<IPositionable>(); // PERF: Avoid trait lookup
if (pos == null || !pos.IsLeavingCell(a, i.SubCell)) if (i.Actor.OccupiesSpace is not IPositionable pos || !pos.IsLeavingCell(a, i.SubCell))
return true; return true;
} }
} }