Update locomotor cache when Crushable is enabled/disabled

OpenRA · Aug 5, 2019 · b25f0c8 · b25f0c8
1 parent 8046a0c
commit b25f0c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -261,6 +261,7 @@ public interface IActorMap
 		WDist LargestBlockingActorRadius { get; }
 
 		event Action<CPos> UpdateCell;
+		void MarkAsDirty(IOccupySpace selfOccupiesSpace);
 	}
 
 	[RequireExplicitImplementation]

diff --git a/OpenRA.Mods.Common/Traits/Crushable.cs b/OpenRA.Mods.Common/Traits/Crushable.cs
@@ -87,5 +87,15 @@ bool CrushableInner(BitSet<CrushClass> crushClasses, Player crushOwner)
 
 			return Info.CrushClasses.Overlaps(crushClasses);
 		}
+
+		protected override void TraitEnabled(Actor self)
+		{
+			self.World.ActorMap.MarkAsDirty(self.OccupiesSpace);
+		}
+
+		protected override void TraitDisabled(Actor self)
+		{
+			self.World.ActorMap.MarkAsDirty(self.OccupiesSpace);
+		}
 	}
 }
diff --git a/OpenRA.Mods.Common/Traits/World/ActorMap.cs b/OpenRA.Mods.Common/Traits/World/ActorMap.cs
@@ -410,6 +410,13 @@ static void RemoveInfluenceInner(ref InfluenceNode influenceNode, Actor toRemove
 				influenceNode = influenceNode.Next;
 		}
 
+		public void MarkAsDirty(IOccupySpace ios)
+		{
+			if (UpdateCell != null)
+				foreach (var c in ios.OccupiedCells())
+					UpdateCell(c.First);
+		}
+
 		void ITick.Tick(Actor self)
 		{
 			// Position updates are done in one pass