Faster lookup of self-init on atoms

This commit is contained in:
Aronai Sieyes
2020-03-19 15:49:29 -04:00
parent a2be7ed5dd
commit b95ca5568c
2 changed files with 3 additions and 4 deletions

View File

@@ -8,9 +8,9 @@ SUBSYSTEM_DEF(atoms)
init_order = INIT_ORDER_ATOMS init_order = INIT_ORDER_ATOMS
flags = SS_NO_FIRE flags = SS_NO_FIRE
var/initialized = INITIALIZATION_INSSATOMS var/static/initialized = INITIALIZATION_INSSATOMS
// var/list/created_atoms // This is never used, so don't bother. ~Leshana // var/list/created_atoms // This is never used, so don't bother. ~Leshana
var/old_initialized var/static/old_initialized
var/list/late_loaders var/list/late_loaders
var/list/created_atoms var/list/created_atoms

View File

@@ -41,8 +41,7 @@
_preloader.load(src) _preloader.load(src)
// Pass our arguments to InitAtom so they can be passed to initialize(), but replace 1st with if-we're-during-mapload. // Pass our arguments to InitAtom so they can be passed to initialize(), but replace 1st with if-we're-during-mapload.
var/do_initialize = SSatoms && SSatoms.initialized // Workaround our non-ideal initialization order: SSatoms may not exist yet. var/do_initialize = SSatoms.initialized
//var/do_initialize = SSatoms.initialized
if(do_initialize > INITIALIZATION_INSSATOMS) if(do_initialize > INITIALIZATION_INSSATOMS)
args[1] = (do_initialize == INITIALIZATION_INNEW_MAPLOAD) args[1] = (do_initialize == INITIALIZATION_INNEW_MAPLOAD)
if(SSatoms.InitAtom(src, args)) if(SSatoms.InitAtom(src, args))