Browse Source

Refactor `Feature`

Make events functions `OnEnabled()` and `OnEnabled()`
protected rather than public.

Move initialization and clean up logic into
`OnCreated()` and `OnDestroyed()` event functions.
develop
Anton Tarasenko 5 years ago
parent
commit
3969eb3824
  1. 4
      sources/Features/FixAmmoSelling/FixAmmoSelling.uc
  2. 4
      sources/Features/FixDoshSpam/FixDoshSpam.uc
  3. 4
      sources/Features/FixDualiesCost/FixDualiesCost.uc
  4. 4
      sources/Features/FixFFHack/FixFFHack.uc
  5. 4
      sources/Features/FixInfiniteNades/FixInfiniteNades.uc
  6. 4
      sources/Features/FixInventoryAbuse/FixInventoryAbuse.uc
  7. 4
      sources/Features/FixZedTimeLags/FixZedTimeLags.uc

4
sources/Features/FixAmmoSelling/FixAmmoSelling.uc

@ -133,7 +133,7 @@ struct WeaponRecord
// All weapons we've detected so far. // All weapons we've detected so far.
var private array<WeaponRecord> registeredWeapons; var private array<WeaponRecord> registeredWeapons;
public function OnEnabled() protected function OnEnabled()
{ {
local KFWeapon nextWeapon; local KFWeapon nextWeapon;
local KFAmmoPickup nextPickup; local KFAmmoPickup nextPickup;
@ -149,7 +149,7 @@ public function OnEnabled()
} }
} }
public function OnDisabled() protected function OnDisabled()
{ {
local int i; local int i;
local AmmoPickupStalker nextStalker; local AmmoPickupStalker nextStalker;

4
sources/Features/FixDoshSpam/FixDoshSpam.uc

@ -89,7 +89,7 @@ var private array<DoshStreamPerPlayer> currentContributors;
// Wads of cash that are lying around on the map. // Wads of cash that are lying around on the map.
var private array<CashPickup> wads; var private array<CashPickup> wads;
public function OnEnabled() protected function OnEnabled()
{ {
local CashPickup nextCash; local CashPickup nextCash;
// Find all wads of cash laying around on the map, // Find all wads of cash laying around on the map,
@ -100,7 +100,7 @@ public function OnEnabled()
} }
} }
public function OnDisabled() protected function OnDisabled()
{ {
wads.length = 0; wads.length = 0;
currentContributors.length = 0; currentContributors.length = 0;

4
sources/Features/FixDualiesCost/FixDualiesCost.uc

@ -145,7 +145,7 @@ var private const array<WeaponDataRecord> storedValues;
// Sell value of the last seen pickup in 'OverridePickupQuery' // Sell value of the last seen pickup in 'OverridePickupQuery'
var private int nextSellValue; var private int nextSellValue;
public function OnEnabled() protected function OnEnabled()
{ {
local KFWeapon nextWeapon; local KFWeapon nextWeapon;
// Find all frags, that spawned when this fix wasn't running. // Find all frags, that spawned when this fix wasn't running.
@ -156,7 +156,7 @@ public function OnEnabled()
level.game.AddGameModifier(Spawn(class'DualiesCostRule')); level.game.AddGameModifier(Spawn(class'DualiesCostRule'));
} }
public function OnDisabled() protected function OnDisabled()
{ {
local GameRules rulesIter; local GameRules rulesIter;
local DualiesCostRule ruleToDestroy; local DualiesCostRule ruleToDestroy;

4
sources/Features/FixFFHack/FixFFHack.uc

@ -56,12 +56,12 @@ var private config const array< class<DamageType> > alwaysScale;
// Damage types, for which we should never reapply friendly fire scaling. // Damage types, for which we should never reapply friendly fire scaling.
var private config const array< class<DamageType> > neverScale; var private config const array< class<DamageType> > neverScale;
public function OnEnabled() protected function OnEnabled()
{ {
level.game.AddGameModifier(Spawn(class'FFHackRule')); level.game.AddGameModifier(Spawn(class'FFHackRule'));
} }
public function OnDisabled() protected function OnDisabled()
{ {
local GameRules rulesIter; local GameRules rulesIter;
local FFHackRule ruleToDestroy; local FFHackRule ruleToDestroy;

4
sources/Features/FixInfiniteNades/FixInfiniteNades.uc

@ -58,7 +58,7 @@ struct FragAmmoRecord
}; };
var private array<FragAmmoRecord> ammoRecords; var private array<FragAmmoRecord> ammoRecords;
public function OnEnabled() protected function OnEnabled()
{ {
local Frag nextFrag; local Frag nextFrag;
// Find all frags, that spawned when this fix wasn't running. // Find all frags, that spawned when this fix wasn't running.
@ -69,7 +69,7 @@ public function OnEnabled()
RecreateFrags(); RecreateFrags();
} }
public function OnDisabled() protected function OnDisabled()
{ {
RecreateFrags(); RecreateFrags();
ammoRecords.length = 0; ammoRecords.length = 0;

4
sources/Features/FixInventoryAbuse/FixInventoryAbuse.uc

@ -44,7 +44,7 @@ struct DualiesPair
// It's made configurable in case of custom dual weapons. // It's made configurable in case of custom dual weapons.
var private config const array<DualiesPair> dualiesClasses; var private config const array<DualiesPair> dualiesClasses;
public function OnEnabled() protected function OnEnabled()
{ {
local float actualInterval; local float actualInterval;
actualInterval = checkInterval; actualInterval = checkInterval;
@ -55,7 +55,7 @@ public function OnEnabled()
SetTimer(actualInterval, true); SetTimer(actualInterval, true);
} }
public function OnDisabled() protected function OnDisabled()
{ {
SetTimer(0.0f, false); SetTimer(0.0f, false);
} }

4
sources/Features/FixZedTimeLags/FixZedTimeLags.uc

@ -65,7 +65,7 @@ var private float updateCooldown;
// Recorded game type, to avoid constant conversions every tick // Recorded game type, to avoid constant conversions every tick
var private KFGameType gameType; var private KFGameType gameType;
public function OnEnabled() protected function OnEnabled()
{ {
gameType = KFGameType(level.game); gameType = KFGameType(level.game);
if (gameType == none) if (gameType == none)
@ -78,7 +78,7 @@ public function OnEnabled()
} }
} }
public function OnDisabled() protected function OnDisabled()
{ {
gameType = KFGameType(level.game); gameType = KFGameType(level.game);
if (gameType != none && disableTick) if (gameType != none && disableTick)

Loading…
Cancel
Save