diff --git a/OpenRa.Game/PathSearch.cs b/OpenRa.Game/PathSearch.cs index 9db1a97464..9967d2b77c 100755 --- a/OpenRa.Game/PathSearch.cs +++ b/OpenRa.Game/PathSearch.cs @@ -92,7 +92,7 @@ namespace OpenRa.Game public static PathSearch FromPoints( IEnumerable froms, int2 target, UnitMovementType umt, bool checkForBlocked ) { - var search = new PathSearch { + var search = new PathSearch { heuristic = DefaultEstimator( target ), umt = umt, checkForBlocked = checkForBlocked }; @@ -103,28 +103,6 @@ namespace OpenRa.Game return search; } - public static PathSearch FromPath( List path, int2 target, UnitMovementType umt, bool checkForBlocked ) - { - var search = new PathSearch { - heuristic = DefaultEstimator( target ), - umt = umt, - checkForBlocked = checkForBlocked }; - - var cost = 0.0f; - var prev = path[ 0 ]; - for( int i = 0 ; i < path.Count ; i++ ) - { - var sl = path[ i ]; - if( Game.BuildingInfluence.CanMoveHere( path[ i ] ) && Game.UnitInfluence.GetUnitAt( path[ i ] ) == null ) - search.AddInitialCell( sl ); - - var d = sl - prev; - cost += ( ( d.X * d.Y != 0 ) ? 1.414213563f : 1.0f );// *passableCost[ (int)umt ][ sl.X, sl.Y ]; - prev = sl; - } - return search; - } - diff --git a/OpenRa.Game/Traits/RenderUnitRotor.cs b/OpenRa.Game/Traits/RenderUnitRotor.cs index 73908d1c82..c20d6cc668 100755 --- a/OpenRa.Game/Traits/RenderUnitRotor.cs +++ b/OpenRa.Game/Traits/RenderUnitRotor.cs @@ -19,7 +19,7 @@ namespace OpenRa.Game.Traits if (self.unitInfo.SecondaryAnim != null) { secondRotorAnim = new Animation(self.unitInfo.Name); - rotorAnim.PlayRepeating(self.unitInfo.SecondaryAnim); + secondRotorAnim.PlayRepeating(self.unitInfo.SecondaryAnim); } }