From a7b5b05e2c2c3c1c5233ad700605282fa6e5d8a3 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 2 Jan 2010 21:10:10 +1300 Subject: [PATCH] fix clash between harv deliver and repair --- OpenRa.Game/Controller.cs | 1 + OpenRa.Game/Traits/Harvester.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs index b0d321995c..870219a625 100644 --- a/OpenRa.Game/Controller.cs +++ b/OpenRa.Game/Controller.cs @@ -178,6 +178,7 @@ namespace OpenRa.Game else return Cursor.MoveBlocked; case "Enter": return Cursor.Enter; + case "Deliver": return Cursor.Enter; case "Infiltrate": return Cursor.Enter; case "Capture": return Cursor.Capture; case "Harvest": return Cursor.Attack; // TODO: special harvest cursor? diff --git a/OpenRa.Game/Traits/Harvester.cs b/OpenRa.Game/Traits/Harvester.cs index 22e5fc0912..ef535cd876 100644 --- a/OpenRa.Game/Traits/Harvester.cs +++ b/OpenRa.Game/Traits/Harvester.cs @@ -34,7 +34,7 @@ namespace OpenRa.Game.Traits if (underCursor != null && underCursor.Owner == self.Owner && underCursor.traits.Contains() && !IsEmpty) - return new Order("Enter", self, underCursor, int2.Zero, null); + return new Order("Deliver", self, underCursor, int2.Zero, null); if (underCursor == null && Rules.Map.ContainsResource(xy)) return new Order("Harvest", self, null, xy, null); @@ -50,7 +50,7 @@ namespace OpenRa.Game.Traits self.QueueActivity(new Move(order.TargetLocation, 0)); self.QueueActivity(new Harvest()); } - else if (order.OrderString == "Enter") + else if (order.OrderString == "Deliver") { self.CancelActivity(); self.QueueActivity(new DeliverOre(order.TargetActor));