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

fix comparing with null

Browse Source
This commit is contained in:
Vladimir Komarov
2013-01-14 11:41:01 +03:00
committed by Matthias Mailänder
parent f6d4b860ee
commit b1afeb4408
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -184,12 +184,11 @@ namespace OpenRA.Mods.RA.AI
int y = 0; int y = 0;
int countUnits = 0; int countUnits = 0;
foreach (var u in units) foreach (var u in units)
if (u.Location != null) {
{ x += u.Location.X;
x += u.Location.X; y += u.Location.Y;
y += u.Location.Y; countUnits++;
countUnits++; }
}
x = x / countUnits; x = x / countUnits;
y = y / countUnits; y = y / countUnits;
return (x != 0 && y != 0) ? new CPos?(new CPos(x, y)) : null; return (x != 0 && y != 0) ? new CPos?(new CPos(x, y)) : null;
@@ -915,16 +914,15 @@ namespace OpenRA.Mods.RA.AI
Func<PPos, CPos, CPos?> findPos = (PPos pos, CPos center) => Func<PPos, CPos, CPos?> findPos = (PPos pos, CPos center) =>
{ {
for (var k = MaxBaseDistance; k >= 0; k--) for (var k = MaxBaseDistance; k >= 0; k--)
if (pos != null) {
{ var tlist = world.FindTilesInCircle(center, k)
var tlist = world.FindTilesInCircle(center, k) .OrderBy(a => (new PPos(a.ToPPos().X, a.ToPPos().Y) - pos).LengthSquared);
.OrderBy(a => (new PPos(a.ToPPos().X, a.ToPPos().Y) - pos).LengthSquared); foreach (var t in tlist)
foreach (var t in tlist) if (world.CanPlaceBuilding(actorType, bi, t, null))
if (world.CanPlaceBuilding(actorType, bi, t, null)) if (bi.IsCloseEnoughToBase(world, p, actorType, t))
if (bi.IsCloseEnoughToBase(world, p, actorType, t)) if (NoBuildingsUnder(Util.ExpandFootprint(FootprintUtils.Tiles(actorType, bi, t), false)))
if (NoBuildingsUnder(Util.ExpandFootprint(FootprintUtils.Tiles(actorType, bi, t), false))) return t;
return t; }
}
return null; return null;
}; };
@@ -1003,7 +1001,7 @@ namespace OpenRA.Mods.RA.AI
.Where(a => a.Owner == enemy && a.HasTrait<IOccupySpace>()); .Where(a => a.Owner == enemy && a.HasTrait<IOccupySpace>());
Actor target = null; Actor target = null;
if (targets.Any() && baseCenter != null) if (targets.Any())
target = targets.ClosestTo(baseCenter.ToPPos()); target = targets.ClosestTo(baseCenter.ToPPos());
if (target == null) if (target == null)