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

Replace WPos.ToCPos -> Map.CellContaining.

Browse Source
This commit is contained in:
Paul Chote
2013-09-17 22:57:30 +12:00
parent 4bc09692e0
commit 9487f49cd5
43 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/PortableChrono.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA
self.World.OrderGenerator = new PortableChronoOrderGenerator(self);
if (order.OrderID == "PortableChronoTeleport")
return new Order(order.OrderID, self, queued) { TargetLocation = target.CenterPosition.ToCPos() };
return new Order(order.OrderID, self, queued) { TargetLocation = self.World.Map.CellContaining(target.CenterPosition) };
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
}
@@ -120,7 +120,7 @@ namespace OpenRA.Mods.RA
// TODO: When target modifiers are configurable this needs to be revisited
if (modifiers.HasModifier(TargetModifiers.ForceMove) || modifiers.HasModifier(TargetModifiers.ForceQueue))
{
var xy = target.CenterPosition.ToCPos();
var xy = self.World.Map.CellContaining(target.CenterPosition);
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
@@ -153,7 +153,7 @@ namespace OpenRA.Mods.RA
yield break;
}
if (self.IsInWorld && self.CenterPosition.ToCPos() != xy
if (self.IsInWorld && self.Location != xy
&& self.Trait<PortableChrono>().CanTeleport && self.Owner.Shroud.IsExplored(xy))
{
world.CancelInputMode();
@@ -190,7 +190,7 @@ namespace OpenRA.Mods.RA
public string GetCursor(World world, CPos xy, MouseInput mi)
{
if (self.IsInWorld && self.CenterPosition.ToCPos() != xy
if (self.IsInWorld && self.Location != xy
&& self.Trait<PortableChrono>().CanTeleport && self.Owner.Shroud.IsExplored(xy))
return "chrono-target";
else