epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9304 from atlimit8/Fix_AttackBase_GetMinimumRange

Browse Source 
Make AttackBase.GetMinimumRange() return WDist.Zero if there are no available armaments
This commit is contained in:
reaperrr
2015-09-18 01:26:35 +02:00
parent ef451ad4a7 6ab32d75bf
commit 4fa20e78fa
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/WDist.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA
public WDist(int r) { Length = r; } public WDist(int r) { Length = r; }
public static readonly WDist Zero = new WDist(0); public static readonly WDist Zero = new WDist(0);
public static readonly WDist MaxValue = new WDist(int.MaxValue);
public static WDist FromCells(int cells) { return new WDist(1024 * cells); } public static WDist FromCells(int cells) { return new WDist(1024 * cells); }
public static WDist operator +(WDist a, WDist b) { return new WDist(a.Length + b.Length); } public static WDist operator +(WDist a, WDist b) { return new WDist(a.Length + b.Length); }

6
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -167,8 +167,10 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled) if (IsTraitDisabled)
return WDist.Zero; return WDist.Zero;
return Armaments.Where(a => !a.IsTraitDisabled) var min = Armaments.Where(a => !a.IsTraitDisabled)
.Select(a => a.Weapon.MinRange).Min(); .Select(a => a.Weapon.MinRange)
.Append(WDist.MaxValue).Min();
return min != WDist.MaxValue ? min : WDist.Zero;
} }
public WDist GetMaximumRange() public WDist GetMaximumRange()