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

Combine IHasLocation -> IOccupySpace, IMove -> ITeleportable.

Browse Source
This commit is contained in:
Paul Chote
2013-07-21 10:44:07 +12:00
parent 36a45d1a3f
commit ecc119cb29
31 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,8 @@ namespace OpenRA.Mods.RA
return false;
// Cannot unload mid-air
var move = self.TraitOrDefault<IMove>();
if (move != null && move.Altitude > info.minimalUnloadAltitude)
var ios = self.TraitOrDefault<IOccupySpace>();
if (ios != null && ios.Altitude > info.minimalUnloadAltitude)
return false;
// TODO: Check if there is a free tile to unload to
@@ -106,8 +106,8 @@ namespace OpenRA.Mods.RA
return false;
// Cannot load mid-air
var move = self.TraitOrDefault<IMove>();
return move == null || move.Altitude == info.minimalUnloadAltitude;
var ios = self.TraitOrDefault<IOccupySpace>();
return ios == null || ios.Altitude == info.minimalUnloadAltitude;
}
public string CursorForOrder(Actor self, Order order)