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

Remove event handlers to CellEntryChanged when done.

Browse Source 
Several classes would attach event handlers to the Map which would live longer then they did. Detaching them when no longer needed allows the GC to reclaim them.
This commit is contained in:
RoosterDragon
2015-11-01 17:21:42 +00:00
parent c562b8c51e
commit 9f728b287b
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Graphics/TerrainRenderer.cs
View File

@@ -18,11 +18,13 @@ namespace OpenRA.Graphics
readonly TerrainSpriteLayer terrain; readonly TerrainSpriteLayer terrain;
readonly Theater theater; readonly Theater theater;
readonly CellLayer<TerrainTile> mapTiles; readonly CellLayer<TerrainTile> mapTiles;
readonly CellLayer<byte> mapHeight;
public TerrainRenderer(World world, WorldRenderer wr) public TerrainRenderer(World world, WorldRenderer wr)
{ {
theater = wr.Theater; theater = wr.Theater;
mapTiles = world.Map.MapTiles.Value; mapTiles = world.Map.MapTiles.Value;
mapHeight = world.Map.MapHeight.Value;
terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha, terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha,
wr.Palette("terrain"), wr.World.Type != WorldType.Editor); wr.Palette("terrain"), wr.World.Type != WorldType.Editor);
@@ -30,8 +32,8 @@ namespace OpenRA.Graphics
foreach (var cell in world.Map.AllCells) foreach (var cell in world.Map.AllCells)
UpdateCell(cell); UpdateCell(cell);
world.Map.MapTiles.Value.CellEntryChanged += UpdateCell; mapTiles.CellEntryChanged += UpdateCell;
world.Map.MapHeight.Value.CellEntryChanged += UpdateCell; mapHeight.CellEntryChanged += UpdateCell;
} }
public void UpdateCell(CPos cell) public void UpdateCell(CPos cell)
@@ -48,6 +50,8 @@ namespace OpenRA.Graphics
public void Dispose() public void Dispose()
{ {
mapTiles.CellEntryChanged -= UpdateCell;
mapHeight.CellEntryChanged -= UpdateCell;
terrain.Dispose(); terrain.Dispose();
} }
} }

2
OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs
View File

@@ -207,6 +207,8 @@ namespace OpenRA.Mods.Common.Traits
foreach (var kv in spriteLayers.Values) foreach (var kv in spriteLayers.Values)
kv.Dispose(); kv.Dispose();
Map.MapResources.Value.CellEntryChanged -= UpdateCell;
disposed = true; disposed = true;
} }
} }

2
OpenRA.Mods.Common/Traits/World/ResourceLayer.cs
View File

@@ -294,6 +294,8 @@ namespace OpenRA.Mods.Common.Traits
foreach (var kv in spriteLayers.Values) foreach (var kv in spriteLayers.Values)
kv.Dispose(); kv.Dispose();
RenderContent.CellEntryChanged -= UpdateSpriteLayers;
disposed = true; disposed = true;
} }

7
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -442,5 +442,12 @@ namespace OpenRA.Mods.Common.Widgets
var v = (int)((p.Y - mapRect.Y) / previewScale) + world.Map.Bounds.Top; var v = (int)((p.Y - mapRect.Y) / previewScale) + world.Map.Bounds.Top;
return new MPos(u, v).ToCPos(world.Map); return new MPos(u, v).ToCPos(world.Map);
} }
public override void Removed()
{
base.Removed();
world.Map.MapTiles.Value.CellEntryChanged -= UpdateTerrainCell;
world.Map.CustomTerrain.CellEntryChanged -= UpdateTerrainCell;
}
} }
} }