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

#8 hardcoded refs to afld/hpad/fix

Browse Source
This commit is contained in:
Chris Forbes
2010-04-17 10:01:42 +12:00
parent e3ac2a4e88
commit 4b70fa6594
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Traits/Activities/HeliReturn.cs
View File

@@ -29,8 +29,9 @@ namespace OpenRA.Traits.Activities
static Actor ChooseHelipad(Actor self)
{
var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
return self.World.Queries.OwnedBy[self.Owner].FirstOrDefault(
a => a.Info.Name == "hpad" &&
a => rearmBuildings.Contains(a.Info.Name) &&
!Reservable.IsReserved(a));
}

2
OpenRA.Game/Traits/Activities/ReturnToBase.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Traits.Activities
public static Actor ChooseAirfield(Actor self)
{
return self.World.Queries.OwnedBy[self.Owner]
.Where(a => a.Info.Name == "afld"
.Where(a => self.Info.Traits.Get<PlaneInfo>().RearmBuildings.Contains(a.Info.Name)
&& !Reservable.IsReserved(a))
.FirstOrDefault();
}