Move GetTerrainIndex/Info from WorldUtils to Map

2014-06-13 13:57:32 +03:00
parent 0cf2d608e4
commit c282fa1077
20 changed files with 43 additions and 39 deletions
--- a/OpenRA.Game/Map/Map.cs
+++ b/OpenRA.Game/Map/Map.cs
@@ -537,5 +537,18 @@ namespace OpenRA
 				}
 			}
 		}
+
+		public int GetTerrainIndex(CPos cell)
+		{
+			var custom = CustomTerrain[cell.X, cell.Y];
+			var tileSet = Rules.TileSets[Tileset];
+			return custom != -1 ? custom : tileSet.GetTerrainIndex(MapTiles.Value[cell.X, cell.Y]);
+		}
+
+		public TerrainTypeInfo GetTerrainInfo(CPos cell)
+		{
+			var tileSet = Rules.TileSets[Tileset];
+			return tileSet[GetTerrainIndex(cell)];
+		}
 	}
 }