Fix some stupid bugs; remove hardcoded references to water/ore/tree terraintypes

2010-06-26 12:02:30 +12:00
parent bf6b2da1a8
commit 08ee425415
13 changed files with 39 additions and 33 deletions
--- a/OpenRA.Game/Combat.cs
+++ b/OpenRA.Game/Combat.cs
@@ -48,8 +48,7 @@ namespace OpenRA
 			if (!world.Map.IsInMap(targetTile))
 				return;

-			// Todo: Unhardcode "Water" terraintype reference
-			var isWater = world.GetTerrainType(targetTile) == "Water";
+			var isWater = world.GetTerrainInfo(targetTile).IsWater;

 			if (warhead.Explosion != 0)
 				world.AddFrameEndTask(