From 67418e0b9d5e4d37c7cfd498a1413b4a0a84f5cc Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 1 Aug 2010 12:23:45 +1200 Subject: [PATCH] fix capturing of neutral buildings --- OpenRA.Mods.RA/EngineerCapture.cs | 6 +++--- OpenRA.Mods.RA/EngineerRepair.cs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenRA.Mods.RA/EngineerCapture.cs b/OpenRA.Mods.RA/EngineerCapture.cs index b208b48191..5adbce0da8 100644 --- a/OpenRA.Mods.RA/EngineerCapture.cs +++ b/OpenRA.Mods.RA/EngineerCapture.cs @@ -8,11 +8,11 @@ */ #endregion -using OpenRA.Mods.RA.Activities; +using System.Drawing; using OpenRA.Effects; +using OpenRA.Mods.RA.Activities; using OpenRA.Traits; using OpenRA.Traits.Activities; -using System.Drawing; namespace OpenRA.Mods.RA { @@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA { if (mi.Button != MouseButton.Right) return null; if (underCursor == null) return null; - if (self.Owner.Stances[underCursor.Owner] != Stance.Enemy) return null; + if (self.Owner.Stances[underCursor.Owner] == Stance.Ally) return null; if (!underCursor.traits.Contains() || !underCursor.Info.Traits.Get().Capturable) return null; return new Order("CaptureBuilding", self, underCursor); diff --git a/OpenRA.Mods.RA/EngineerRepair.cs b/OpenRA.Mods.RA/EngineerRepair.cs index fecbaeaddb..54392851c0 100644 --- a/OpenRA.Mods.RA/EngineerRepair.cs +++ b/OpenRA.Mods.RA/EngineerRepair.cs @@ -6,13 +6,13 @@ * as published by the Free Software Foundation. For more information, * see LICENSE. */ -#endregion - -using OpenRA.Mods.RA.Activities; -using OpenRA.Traits; +#endregion + +using System.Drawing; +using OpenRA.Effects; +using OpenRA.Mods.RA.Activities; +using OpenRA.Traits; using OpenRA.Traits.Activities; -using OpenRA.Effects; -using System.Drawing; namespace OpenRA.Mods.RA {