moving Map, TileSet from Rules to World

2010-01-17 12:18:26 +13:00
parent fa421410fe
commit 1ec3ee60eb
19 changed files with 135 additions and 130 deletions
--- a/OpenRa.Game/Traits/ConstructionYard.cs
+++ b/OpenRa.Game/Traits/ConstructionYard.cs
@@ -66,9 +66,9 @@ namespace OpenRa.Traits
 			
 			if (!crushable) return false;
 			
-			return Rules.Map.IsInMap(a.X, a.Y) &&
+			return Game.world.Map.IsInMap(a.X, a.Y) &&
 				TerrainCosts.Cost(GetMovementType(),
-					Rules.TileSet.GetWalkability(Rules.Map.MapTiles[a.X, a.Y])) < double.PositiveInfinity;
+					Game.world.TileSet.GetWalkability(Game.world.Map.MapTiles[a.X, a.Y])) < double.PositiveInfinity;
 		}
 	}
 }