Merge pull request #7714 from Mailaender/d2k-black-tile-removal

Removed legacy ARRAKIS tiles.
2015-03-23 15:15:28 -05:00
parent 2223b0a43b 2f1aae59eb
commit ab63d3f7df
2 changed files with 4 additions and 272 deletions
--- a/OpenRA.Game/Map/TileSet.cs
+++ b/OpenRA.Game/Map/TileSet.cs
@@ -246,7 +246,9 @@ namespace OpenRA

 		public byte GetTerrainIndex(TerrainTile r)
 		{
-			var tpl = Templates[r.Type];
+			TerrainTemplateInfo tpl;
+			if (!Templates.TryGetValue(r.Type, out tpl))
+				return defaultWalkableTerrainIndex;

 			if (tpl.Contains(r.Index))
 			{