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

Rename SelfReloads to AutoReloads

Browse Source
This commit is contained in:
reaperrr
2017-11-12 00:49:15 +01:00
committed by Paul Chote
parent 18c371d702
commit d602ec6485
8 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/AmmoPool.cs
View File

@@ -62,10 +62,9 @@ namespace OpenRA.Mods.Common.Traits
readonly Stack<int> tokens = new Stack<int>();
ConditionManager conditionManager;
bool selfReloads;
// HACK: Temporarily needed until Rearm activity is gone for good
[Sync] public int RemainingTicks;
[Sync] int currentAmmo;
public AmmoPool(Actor self, AmmoPoolInfo info)
@@ -100,12 +99,12 @@ namespace OpenRA.Mods.Common.Traits
// This mostly serves to avoid complicated ReloadAmmoPool look-ups in various other places.
// TODO: Investigate removing this when the Rearm activity is replaced with a condition-based solution.
public bool SelfReloads { get { return selfReloads; } }
public bool AutoReloads { get; private set; }
void INotifyCreated.Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
selfReloads = self.TraitsImplementing<ReloadAmmoPool>().Any(r => r.Info.AmmoPool == Info.Name && r.Info.RequiresCondition == null);
AutoReloads = self.TraitsImplementing<ReloadAmmoPool>().Any(r => r.Info.AmmoPool == Info.Name && r.Info.RequiresCondition == null);
UpdateCondition(self);