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

ffs, doing it the hard way as usual

Browse Source
This commit is contained in:
Chris Forbes
2010-08-01 14:36:53 +12:00
parent 002bc20d50
commit aafbeed703
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/Activities/ReturnToBase.cs
View File

@@ -38,13 +38,14 @@ namespace OpenRA.Mods.RA.Activities
if (dest == null) if (dest == null)
{ {
dest = ChooseAirfield(self); dest = ChooseAirfield(self);
var res = dest.traits.GetOrDefault<Reservable>(); }
if (res != null)
{ var res = dest.traits.GetOrDefault<Reservable>();
var plane = self.traits.Get<Plane>(); if (res != null)
plane.UnReserve(); {
plane.reservation = res.Reserve(self); var plane = self.traits.Get<Plane>();
} plane.UnReserve();
plane.reservation = res.Reserve(self);
} }
var landPos = dest.CenterLocation; var landPos = dest.CenterLocation;

4
OpenRA.Mods.RA/Plane.cs
View File

@@ -108,10 +108,6 @@ namespace OpenRA.Mods.RA
UnReserve(); UnReserve();
var res = order.TargetActor.traits.GetOrDefault<Reservable>();
if (res != null)
reservation = res.Reserve(self);
var info = self.Info.Traits.Get<PlaneInfo>(); var info = self.Info.Traits.Get<PlaneInfo>();
if (self.Owner == self.World.LocalPlayer) if (self.Owner == self.World.LocalPlayer)