diff --git a/OpenRA.FileFormats/Map/TileSet.cs b/OpenRA.FileFormats/Map/TileSet.cs index 7c33da85f7..412dd0e71b 100644 --- a/OpenRA.FileFormats/Map/TileSet.cs +++ b/OpenRA.FileFormats/Map/TileSet.cs @@ -88,11 +88,8 @@ namespace OpenRA.FileFormats public byte[] GetBytes(TileReference r) { Terrain tile; - try { - if( tiles.TryGetValue( r.type, out tile ) ) - return tile.TileBitmapBytes[ r.image ]; - } - catch (System.ArgumentOutOfRangeException) { } + if( tiles.TryGetValue( r.type, out tile ) ) + return tile.TileBitmapBytes[ r.image ]; byte[] missingTile = new byte[ 24 * 24 ]; for( int i = 0 ; i < missingTile.Length ; i++ ) @@ -101,16 +98,13 @@ namespace OpenRA.FileFormats return missingTile; } - public TerrainType GetTerrainType(TileReference r) - { - try { - return walk[r.type].TerrainType[r.image]; - } - catch (KeyNotFoundException) - { - return 0; // Default zero (walkable) - } - + public TerrainType GetTerrainType( TileReference r ) + { + var tt = walk[ r.type ].TerrainType; + TerrainType ret; + if( !tt.TryGetValue( r.image, out ret ) ) + return 0;// Default zero (walkable) + return ret; } } } diff --git a/OpenRA.Game/Traits/World/ResourceLayer.cs b/OpenRA.Game/Traits/World/ResourceLayer.cs index 2530663962..60f0a03c34 100644 --- a/OpenRA.Game/Traits/World/ResourceLayer.cs +++ b/OpenRA.Game/Traits/World/ResourceLayer.cs @@ -164,10 +164,6 @@ namespace OpenRA.Traits public void Spread(ResourceTypeInfo info) { var map = w.Map; - - var mini = map.XOffset; var maxi = map.XOffset + map.Width; - var minj = map.YOffset; var maxj = map.YOffset + map.Height; - var growMask = new bool[map.MapSize.X, map.MapSize.Y]; for (int i = map.TopLeft.X; i < map.BottomRight.X; i++) for (int j = map.TopLeft.Y; j < map.BottomRight.Y; j++) diff --git a/mods/ra/templates.ini b/mods/ra/templates.ini index 3764b2df92..c042878439 100644 --- a/mods/ra/templates.ini +++ b/mods/ra/templates.ini @@ -13,6 +13,21 @@ [TEM0] Name=CLEAR1 tiletype0=0 +tiletype1=0 +tiletype2=0 +tiletype3=0 +tiletype4=0 +tiletype5=0 +tiletype6=0 +tiletype7=0 +tiletype8=0 +tiletype9=0 +tiletype10=0 +tiletype11=0 +tiletype12=0 +tiletype13=0 +tiletype14=0 +tiletype15=0 [TEM1] Name=W1 @@ -2753,6 +2768,21 @@ tiletype8=0 [TEM255] Name=CLEAR1 tiletype0=0 +tiletype1=0 +tiletype2=0 +tiletype3=0 +tiletype4=0 +tiletype5=0 +tiletype6=0 +tiletype7=0 +tiletype8=0 +tiletype9=0 +tiletype10=0 +tiletype11=0 +tiletype12=0 +tiletype13=0 +tiletype14=0 +tiletype15=0 [TEM378] Name=BRIDGE1H