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

fixed 741 -- use the correct superweapon building when more than one is available and some are disabled

Browse Source
This commit is contained in:
Chris Forbes
2011-05-30 21:26:05 +12:00
parent 7ac57014fb
commit 61cde675ea
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
View File

@@ -131,12 +131,17 @@ namespace OpenRA.Mods.RA
Manager = manager; Manager = manager;
Key = key; Key = key;
} }
static bool InstanceDisabled(SupportPower sp)
{
return sp.self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
}
bool notifiedCharging; bool notifiedCharging;
bool notifiedReady; bool notifiedReady;
public void Tick() public void Tick()
{ {
Active = !Disabled && Instances.Any(i => !i.self.TraitsImplementing<IDisable>().Any(d => d.Disabled)); Active = !Disabled && Instances.Any(i => !InstanceDisabled(i));
if (Active) if (Active)
{ {
@@ -173,7 +178,8 @@ namespace OpenRA.Mods.RA
if (!Ready) if (!Ready)
return; return;
var power = Instances.First(); var power = Instances.First(i => !InstanceDisabled(i));
// Note: order.Subject is the *player* actor // Note: order.Subject is the *player* actor
power.Activate(power.self, order); power.Activate(power.self, order);
RemainingTime = TotalTime; RemainingTime = TotalTime;