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

fix some dumbness in Production/ITeleportable

Browse Source
This commit is contained in:
Chris Forbes
2011-01-02 14:41:48 +13:00
parent 7b5a8cf089
commit 2048900c10
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -122,6 +122,7 @@ namespace OpenRA.Traits
bool CanEnterCell(int2 location); bool CanEnterCell(int2 location);
void SetPosition(Actor self, int2 cell); void SetPosition(Actor self, int2 cell);
void SetPxPosition(Actor self, int2 px); void SetPxPosition(Actor self, int2 px);
void AdjustPxPosition(Actor self, int2 px); /* works like SetPxPosition, but visual only */
} }
public interface IMove : ITeleportable public interface IMove : ITeleportable

2
OpenRA.Mods.RA/Air/Aircraft.cs
View File

@@ -69,6 +69,8 @@ namespace OpenRA.Mods.RA.Air
SubPxPosition = px * 1024; SubPxPosition = px * 1024;
} }
public void AdjustPxPosition(Actor self, int2 px) { SetPxPosition(self, px); }
public bool AircraftCanEnter(Actor a) public bool AircraftCanEnter(Actor a)
{ {
if( self.Owner != a.Owner ) return false; if( self.Owner != a.Owner ) return false;

2
OpenRA.Mods.RA/Crate.cs
View File

@@ -89,6 +89,8 @@ namespace OpenRA.Mods.RA
SetPosition( self, Util.CellContaining( px ) ); SetPosition( self, Util.CellContaining( px ) );
} }
public void AdjustPxPosition(Actor self, int2 px) { SetPxPosition(self, px); }
public bool CanEnterCell(int2 cell) public bool CanEnterCell(int2 cell)
{ {
if (!self.World.Map.IsInMap(cell.X, cell.Y)) return false; if (!self.World.Map.IsInMap(cell.X, cell.Y)) return false;

5
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -185,6 +185,11 @@ namespace OpenRA.Mods.RA.Move
FinishedMoving(self); FinishedMoving(self);
} }
public void AdjustPxPosition(Actor self, int2 px) /* visual hack only */
{
PxPosition = px;
}
public IEnumerable<IOrderTargeter> Orders { get { yield return new MoveOrderTargeter(Info); } } public IEnumerable<IOrderTargeter> Orders { get { yield return new MoveOrderTargeter(Info); } }
// Note: Returns a valid order even if the unit can't move to the target // Note: Returns a valid order even if the unit can't move to the target

6
OpenRA.Mods.RA/Production.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA
// Set the physical position of the unit as the exit cell // Set the physical position of the unit as the exit cell
teleportable.SetPosition(newUnit,exit); teleportable.SetPosition(newUnit,exit);
var to = Util.CenterOfCell(exit); var to = Util.CenterOfCell(exit);
teleportable.SetPxPosition(newUnit, spawn); teleportable.AdjustPxPosition(newUnit, spawn);
if (facing != null) if (facing != null)
facing.Facing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, facing.Facing) : exitinfo.Facing; facing.Facing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, facing.Facing) : exitinfo.Facing;
self.World.Add(newUnit); self.World.Add(newUnit);
@@ -84,7 +84,7 @@ namespace OpenRA.Mods.RA
if (rp == null) if (rp == null)
return exitLocation; return exitLocation;
var mobile = self.TraitOrDefault<Mobile>(); var mobile = newUnit.TraitOrDefault<Mobile>();
if (mobile != null) if (mobile != null)
{ {
newUnit.QueueActivity(mobile.MoveTo(rp.rallyPoint, 1)); newUnit.QueueActivity(mobile.MoveTo(rp.rallyPoint, 1));
@@ -92,7 +92,7 @@ namespace OpenRA.Mods.RA
} }
// todo: don't talk about HeliFly here. // todo: don't talk about HeliFly here.
var helicopter = self.TraitOrDefault<Helicopter>(); var helicopter = newUnit.TraitOrDefault<Helicopter>();
if (helicopter != null) if (helicopter != null)
{ {
newUnit.QueueActivity(new HeliFly(Util.CenterOfCell(rp.rallyPoint))); newUnit.QueueActivity(new HeliFly(Util.CenterOfCell(rp.rallyPoint)));