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

Remove *PxPosition from IOccupySpace/IPositionable.

Browse Source
This commit is contained in:
Paul Chote
2013-07-21 12:17:40 +12:00
parent 19165d259d
commit 6a435752fd
12 changed files with 19 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Actor.cs
View File

@@ -34,17 +34,8 @@ namespace OpenRA
public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
public CPos Location { get { return occupySpace.Value.TopLeft; } }
public PPos CenterLocation { get { return occupySpace.Value.PxPosition; } }
public WPos CenterPosition
{
get
{
var altitude = occupySpace.Value != null ? occupySpace.Value.Altitude : 0;
return CenterLocation.ToWPos(altitude);
}
}
public PPos CenterLocation { get { return PPos.FromWPos(occupySpace.Value.CenterPosition); } }
public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
public WRot Orientation
{

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

@@ -99,7 +99,6 @@ namespace OpenRA.Traits
public interface IOccupySpace
{
PPos PxPosition { get; }
WPos CenterPosition { get; }
CPos TopLeft { get; }
IEnumerable<Pair<CPos, SubCell>> OccupiedCells();
@@ -143,9 +142,6 @@ namespace OpenRA.Traits
{
bool CanEnterCell(CPos location);
void SetPosition(Actor self, CPos cell);
void SetPxPosition(Actor self, PPos px);
void AdjustPxPosition(Actor self, PPos px); /* works like SetPxPosition, but visual only */
void SetPosition(Actor self, WPos pos);
void SetVisualPosition(Actor self, WPos pos);
}