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

Revert "Fix CurrentAdjacentCells cache not acting as a cache"

Browse Source 
This reverts commit 6040187844.
This commit is contained in:
Matthias Mailänder
2024-07-30 19:32:13 +02:00
committed by abcdefg30
parent 261bf88382
commit 05ed9d9a73
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -107,9 +107,9 @@ namespace OpenRA.Mods.Common.Traits
bool takeOffAfterLoad; bool takeOffAfterLoad;
bool initialised; bool initialised;
readonly CachedTransform<CPos, CPos[]> currentAdjacentCells; readonly CachedTransform<CPos, IEnumerable<CPos>> currentAdjacentCells;
public CPos[] CurrentAdjacentCells => currentAdjacentCells.Update(self.Location); public IEnumerable<CPos> CurrentAdjacentCells => currentAdjacentCells.Update(self.Location);
public IEnumerable<Actor> Passengers => cargo; public IEnumerable<Actor> Passengers => cargo;
public int PassengerCount => cargo.Count; public int PassengerCount => cargo.Count;
@@ -123,8 +123,8 @@ namespace OpenRA.Mods.Common.Traits
self = init.Self; self = init.Self;
checkTerrainType = info.UnloadTerrainTypes.Count > 0; checkTerrainType = info.UnloadTerrainTypes.Count > 0;
currentAdjacentCells = new CachedTransform<CPos, CPos[]>(loc => currentAdjacentCells = new CachedTransform<CPos, IEnumerable<CPos>>(loc =>
Util.AdjacentCells(self.World, Target.FromActor(self)).Where(c => loc != c).ToArray()); Util.AdjacentCells(self.World, Target.FromActor(self)).Where(c => loc != c));
var runtimeCargoInit = init.GetOrDefault<RuntimeCargoInit>(info); var runtimeCargoInit = init.GetOrDefault<RuntimeCargoInit>(info);
var cargoInit = init.GetOrDefault<CargoInit>(info); var cargoInit = init.GetOrDefault<CargoInit>(info);