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

Fix actors with no footprint leaving stale data when deleted.

Browse Source
This commit is contained in:
Paul Chote
2020-03-29 13:34:24 +01:00
committed by reaperrr
parent 73a2b59c2c
commit d62fb901e2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
View File

@@ -133,12 +133,13 @@ namespace OpenRA.Mods.Common.Traits
if (!preview.Bounds.IsEmpty) if (!preview.Bounds.IsEmpty)
screenMap.Add(preview, preview.Bounds); screenMap.Add(preview, preview.Bounds);
foreach (var kv in preview.Footprint)
AddPreviewLocation(preview, kv.Key);
// Fallback to the actor's CenterPosition for the ActorMap if it has no Footprint // Fallback to the actor's CenterPosition for the ActorMap if it has no Footprint
if (!preview.Footprint.Any()) var footprint = preview.Footprint.Select(kv => kv.Key).ToArray();
AddPreviewLocation(preview, worldRenderer.World.Map.CellContaining(preview.CenterPosition)); if (!footprint.Any())
footprint = new[] { worldRenderer.World.Map.CellContaining(preview.CenterPosition) };
foreach (var cell in footprint)
AddPreviewLocation(preview, cell);
if (!initialSetup) if (!initialSetup)
{ {
@@ -154,16 +155,21 @@ namespace OpenRA.Mods.Common.Traits
previews.Remove(preview); previews.Remove(preview);
screenMap.Remove(preview); screenMap.Remove(preview);
foreach (var kv in preview.Footprint) // Fallback to the actor's CenterPosition for the ActorMap if it has no Footprint
var footprint = preview.Footprint.Select(kv => kv.Key).ToArray();
if (!footprint.Any())
footprint = new[] { worldRenderer.World.Map.CellContaining(preview.CenterPosition) };
foreach (var cell in footprint)
{ {
List<EditorActorPreview> list; List<EditorActorPreview> list;
if (!cellMap.TryGetValue(kv.Key, out list)) if (!cellMap.TryGetValue(cell, out list))
continue; continue;
list.Remove(preview); list.Remove(preview);
if (!list.Any()) if (!list.Any())
cellMap.Remove(kv.Key); cellMap.Remove(cell);
} }
UpdateNeighbours(preview.Footprint); UpdateNeighbours(preview.Footprint);