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

fix crash on telling {sam,agun} to attack ground

Browse Source
This commit is contained in:
Chris Forbes
2010-08-04 18:23:06 +12:00
parent 0f20133af0
commit 71792a8f09
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -257,6 +257,6 @@ namespace OpenRA.Mods.RA
public bool HasAnyValidWeapons(Target t) { return Weapons.Any(w => w.IsValidAgainst(t)); } public bool HasAnyValidWeapons(Target t) { return Weapons.Any(w => w.IsValidAgainst(t)); }
public float GetMaximumRange() { return Weapons.Max(w => w.Info.Range); } public float GetMaximumRange() { return Weapons.Max(w => w.Info.Range); }
public Weapon ChooseWeaponForTarget(Target t) { return Weapons.First(w => w.IsValidAgainst(t)); } public Weapon ChooseWeaponForTarget(Target t) { return Weapons.FirstOrDefault(w => w.IsValidAgainst(t)); }
} }
} }

2
OpenRA.Mods.RA/AttackTurreted.cs
View File

@@ -51,6 +51,8 @@ namespace OpenRA.Mods.RA
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */ const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
/* todo: choose the appropriate weapon, when only one works against this target */ /* todo: choose the appropriate weapon, when only one works against this target */
var weapon = ChooseWeaponForTarget(Target.FromOrder(order)); var weapon = ChooseWeaponForTarget(Target.FromOrder(order));
if (weapon == null)
return;
target = Target.FromOrder(order); target = Target.FromOrder(order);