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

Merge pull request #6698 from RoosterDragon/memory-savings

Browse Source 
Small memory savings
This commit is contained in:
Paul Chote
2014-10-12 11:43:08 +13:00
parent f800cd7f02 69125989ab
commit fad0215842
15 changed files with 79 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Map/Map.cs
View File

@@ -122,7 +122,7 @@ namespace OpenRA
[FieldLoader.Ignore] public Lazy<CellLayer<TerrainTile>> MapTiles;
[FieldLoader.Ignore] public Lazy<CellLayer<ResourceTile>> MapResources;
[FieldLoader.Ignore] public CellLayer<int> CustomTerrain;
[FieldLoader.Ignore] public CellLayer<byte> CustomTerrain;
[FieldLoader.Ignore] Lazy<TileSet> cachedTileSet;
[FieldLoader.Ignore] Lazy<Ruleset> rules;
@@ -281,9 +281,9 @@ namespace OpenRA
var br = Map.MapToCell(TileShape, new CPos(Bounds.Right - 1, Bounds.Bottom - 1));
Cells = new CellRegion(TileShape, tl, br);
CustomTerrain = new CellLayer<int>(this);
CustomTerrain = new CellLayer<byte>(this);
foreach (var cell in Cells)
CustomTerrain[cell] = -1;
CustomTerrain[cell] = byte.MaxValue;
}
public Ruleset PreloadRules()
@@ -673,10 +673,10 @@ namespace OpenRA
}
}
public int GetTerrainIndex(CPos cell)
public byte GetTerrainIndex(CPos cell)
{
var custom = CustomTerrain[cell];
return custom != -1 ? custom : cachedTileSet.Value.GetTerrainIndex(MapTiles.Value[cell]);
return custom != byte.MaxValue ? custom : cachedTileSet.Value.GetTerrainIndex(MapTiles.Value[cell]);
}
public TerrainTypeInfo GetTerrainInfo(CPos cell)