From 3fad0983b9aeaac9037c38a102731ebcf121d655 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 13 Oct 2012 12:35:30 +1300 Subject: [PATCH] simplify Mobile using new ordering from FindTilesInCircle --- OpenRA.Mods.RA/Move/Mobile.cs | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs index da7f4e0b5e..a5117c215b 100755 --- a/OpenRA.Mods.RA/Move/Mobile.cs +++ b/OpenRA.Mods.RA/Move/Mobile.cs @@ -232,16 +232,9 @@ namespace OpenRA.Mods.RA.Move if (CanEnterCell(target)) return target; - var searched = new List(); - // Limit search to a radius of 10 tiles - for (int r = minRange; r < maxRange; r++) - foreach (var tile in self.World.FindTilesInCircle(target, r).Except(searched)) - { - if (CanEnterCell(tile)) - return tile; - - searched.Add(tile); - } + foreach (var tile in self.World.FindTilesInCircle(target, maxRange)) + if (CanEnterCell(tile)) + return tile; // Couldn't find a cell return target; @@ -252,15 +245,9 @@ namespace OpenRA.Mods.RA.Move if (check(target)) return target; - var searched = new List(); - for (int r = minRange; r < maxRange; r++) - foreach (var tile in self.World.FindTilesInCircle(target, r).Except(searched)) - { - if (check(tile)) - return tile; - - searched.Add(tile); - } + foreach (var tile in self.World.FindTilesInCircle(target, maxRange)) + if (check(tile)) + return tile; // Couldn't find a cell return target;