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

Remove invalid caching from GCOT.

Browse Source
This commit is contained in:
Paul Chote
2020-03-18 09:58:25 +00:00
committed by abcdefg30
parent 32700df117
commit 1ff037a257
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnTerrain.cs
View File

@@ -35,9 +35,7 @@ namespace OpenRA.Mods.Common.Traits
ConditionManager conditionManager; ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken; int conditionToken = ConditionManager.InvalidConditionToken;
string cachedTerrain; string cachedTerrain;
CPos cachedLocation;
public GrantConditionOnTerrain(ActorInitializer init, GrantConditionOnTerrainInfo info) public GrantConditionOnTerrain(ActorInitializer init, GrantConditionOnTerrainInfo info)
{ {
@@ -53,9 +51,10 @@ namespace OpenRA.Mods.Common.Traits
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
{ {
var loc = self.Location; var loc = self.Location;
if (conditionManager == null || loc == cachedLocation) if (conditionManager == null)
return; return;
// The terrain type may change between ticks without the actor moving
var currentTerrain = loc.Layer == 0 ? self.World.Map.GetTerrainInfo(loc).Type : var currentTerrain = loc.Layer == 0 ? self.World.Map.GetTerrainInfo(loc).Type :
tileSet[self.World.GetCustomMovementLayers()[loc.Layer].GetTerrainIndex(loc)].Type; tileSet[self.World.GetCustomMovementLayers()[loc.Layer].GetTerrainIndex(loc)].Type;
@@ -69,7 +68,6 @@ namespace OpenRA.Mods.Common.Traits
} }
cachedTerrain = currentTerrain; cachedTerrain = currentTerrain;
cachedLocation = loc;
} }
} }
} }