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

Add World parameter to Target.FromCell.

Browse Source
This commit is contained in:
Paul Chote
2013-09-17 21:50:15 +12:00
parent e4ea012b9e
commit 086ec07eb6
21 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Orders
var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
.Where(a => a.Info.Traits.Contains<ITargetableInfo>())
.WithHighestSelectionPriority();
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(xy);
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
}
var orders = world.Selection.Actors
@@ -76,7 +76,7 @@ namespace OpenRA.Orders
var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
.Where(a => a.Info.Traits.Contains<ITargetableInfo>())
.WithHighestSelectionPriority();
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(xy);
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
}
var orders = world.Selection.Actors

4
OpenRA.Game/Traits/Target.cs
View File

@@ -28,12 +28,12 @@ namespace OpenRA.Traits
int generation;
public static Target FromPos(WPos p) { return new Target { pos = p, type = TargetType.Terrain }; }
public static Target FromCell(CPos c) { return new Target { pos = c.CenterPosition, type = TargetType.Terrain }; }
public static Target FromCell(World w, CPos c) { return new Target { pos = c.CenterPosition, type = TargetType.Terrain }; }
public static Target FromOrder(World w, Order o)
{
return o.TargetActor != null
? FromActor(o.TargetActor)
: FromCell(o.TargetLocation);
: FromCell(w, o.TargetLocation);
}
public static Target FromActor(Actor a)