dkanus
/
Acedia
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Remove `selfReference` from `Packages` mutator 

This variable didn't serve any really useful purpose, but has led to
game crashes. While adding proper cleanup could also solve these
crashes, there is no real point to keeping it at all.

NOTE: It's only purpose was to make sure only one instance of
corresponding mutator exists, but duplicates shouldn't happen in the
first place.
new
Anton Tarasenko 2 years ago
parent
925f9a100d
commit
6a13c509a2
1 changed files with 0 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      sources/Packages.uc

27
sources/Packages.uc
Unescape View File

@ -22,13 +22,6 @@
class Packages extends Mutator class Packages extends Mutator
config(Acedia); config(Acedia);
// Default value of this variable will be used to store
// reference to the active Acedia mutator,
// as well as to ensure there's only one copy of it.
// We can't use 'Singleton' class for that,
// as we have to derive from 'Mutator'.
var private Packages selfReference;
// Acedia's reference to a `Global` object. // Acedia's reference to a `Global` object.
var private Global _; var private Global _;
var private ServerGlobal _server; var private ServerGlobal _server;
@ -56,11 +49,6 @@ struct FeatureConfigPair
var public Text configName; var public Text configName;
}; };
static public final function Packages GetInstance()
{
return default.selfReference;
}
// "Constructor" // "Constructor"
simulated function PreBeginPlay() simulated function PreBeginPlay()
{ {
@ -74,13 +62,6 @@ simulated function PreBeginPlay()
private simulated function InitializeClient() private simulated function InitializeClient()
{ {
// Enforce one copy rule and remember a reference to that copy
if (default.selfReference != none)
{
Destroy();
return;
}
default.selfReference = self;
_ = class'Global'.static.GetInstance(); _ = class'Global'.static.GetInstance();
class'ClientLevelCore'.static.CreateLevelCore(self); class'ClientLevelCore'.static.CreateLevelCore(self);
} }
@ -95,13 +76,6 @@ private function InitializeServer()
AddToPackageMap("Acedia"); AddToPackageMap("Acedia");
} }
CheckForGarbage(); CheckForGarbage();
// Enforce one copy rule and remember a reference to that copy
if (default.selfReference != none)
{
Destroy();
return;
}
default.selfReference = self;
// Launch and setup core Acedia // Launch and setup core Acedia
_ = class'Global'.static.GetInstance(); _ = class'Global'.static.GetInstance();
_server = class'ServerGlobal'.static.GetInstance(); _server = class'ServerGlobal'.static.GetInstance();
@ -147,7 +121,6 @@ function ServerTraveling(string URL, bool bItems)
_.memory.Free(votingAdapter); _.memory.Free(votingAdapter);
votingAdapter = none; votingAdapter = none;
} }
default.selfReference = none;
_.environment.ShutDown(); _.environment.ShutDown();
if (nextMutator != none) { if (nextMutator != none) {
nextMutator.ServerTraveling(URL, bItems); nextMutator.ServerTraveling(URL, bItems);