Ore.cs is dead. Long live ResourceLayer.cs.

2010-03-03 21:15:44 +13:00
parent 6c229f3273
commit 15b82830a2
8 changed files with 14 additions and 74 deletions
--- a/OpenRA.Game/Traits/Activities/Harvest.cs
+++ b/OpenRA.Game/Traits/Activities/Harvest.cs
@@ -64,12 +64,14 @@ namespace OpenRA.Traits.Activities

 		void FindMoreOre(Actor self)
 		{
+			var res = self.World.WorldActor.traits.Get<ResourceLayer>();
+
 			self.QueueActivity(new Move(
 				() =>
 				{
 					var search = new PathSearch
 					{
-						heuristic = loc => (self.World.Map.ContainsResource(loc) ? 0 : 1),
+						heuristic = loc => (res.GetResource(loc) != null ? 0 : 1),
 						umt = UnitMovementType.Wheel,
 						checkForBlocked = true
 					};