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

Merge Plane and Helicopter into Aircraft

Browse Source
This commit is contained in:
Pavel Penev
2015-08-06 18:33:52 +03:00
parent 0ee1ad3fa4
commit 8a44366667
28 changed files with 401 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -18,8 +18,8 @@ namespace OpenRA.Mods.Common.Activities
{
public class ReturnToBase : Activity
{
readonly Plane plane;
readonly PlaneInfo planeInfo;
readonly Aircraft plane;
readonly AircraftInfo planeInfo;
bool isCalculated;
Actor dest;
WPos w1, w2, w3;
@@ -27,13 +27,13 @@ namespace OpenRA.Mods.Common.Activities
public ReturnToBase(Actor self, Actor dest = null)
{
this.dest = dest;
plane = self.Trait<Plane>();
planeInfo = self.Info.TraitInfo<PlaneInfo>();
plane = self.Trait<Aircraft>();
planeInfo = self.Info.TraitInfo<AircraftInfo>();
}
public static Actor ChooseAirfield(Actor self, bool unreservedOnly)
{
var rearmBuildings = self.Info.TraitInfo<PlaneInfo>().RearmBuildings;
var rearmBuildings = self.Info.TraitInfo<AircraftInfo>().RearmBuildings;
return self.World.ActorsWithTrait<Reservable>()
.Where(a => a.Actor.Owner == self.Owner)
.Where(a => rearmBuildings.Contains(a.Actor.Info.Name)
@@ -94,7 +94,6 @@ namespace OpenRA.Mods.Common.Activities
w1 = posCenter + tangentOffset;
w2 = approachCenter + tangentOffset;
w3 = approachStart;
plane.RTBPathHash = w1 + (WVec)w2 + (WVec)w3;
isCalculated = true;
}