cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 23:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Initialize Safety Cleanup (#23274)

Browse Source 
* Better `in world` Initialization handling

Remove spawn_atom_to_world and SSobj.atom_spawners

Roll SSobj/setup_template_objects and SSobj/Initialize into new generic proc

* >BYOND

* >var names

* Defines

* Actually remove the spawn_atom_to_world definition

* A note on NOT CALLING THE BASE

* Remove set waitfor = 0

* My comments are cool

* In order to prevent just that...
This commit is contained in:
Cyberboss
2017-01-31 21:48:17 -05:00
committed by oranges
parent 1cca4cb56e
commit a4d5579f79
6 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/objects.dm
+29 -26
View File
@@ -1,5 +1,9 @@
var/datum/subsystem/objects/SSobj
#define INITIALIZATION_INSSOBJ 0 //New should not call Initialize
#define INITIALIZATION_INNEW_MAPLOAD 1 //New should call Initialize(TRUE)
#define INITIALIZATION_INNEW_REGULAR 2 //New should call Initialize(FALSE)
/datum/var/isprocessing = 0
/datum/proc/process()
set waitfor = 0
@@ -11,9 +15,8 @@ var/datum/subsystem/objects/SSobj
init_order = 12
priority = 40
var/initialized = FALSE
var/initialized = INITIALIZATION_INSSOBJ
var/old_initialized
var/list/atom_spawners = list()
var/list/processing = list()
var/list/currentrun = list()
@@ -23,28 +26,35 @@ var/datum/subsystem/objects/SSobj
/datum/subsystem/objects/Initialize(timeofdayl)
fire_overlay.appearance_flags = RESET_COLOR
setupGenetics() //to set the mutations' place in structural enzymes, so monkey.initialize() knows where to put the monkey mutation.
trigger_atom_spawners()
for(var/thing in world)
var/atom/A = thing
A.Initialize(TRUE)
CHECK_TICK
initialized = TRUE
InitializeAtoms()
. = ..()
/datum/subsystem/objects/proc/InitializeAtoms(list/objects = null)
initialized = INITIALIZATION_INNEW_MAPLOAD
if(objects)
for(var/thing in objects)
var/atom/A = thing
A.Initialize(TRUE)
CHECK_TICK
else
for(var/atom/A in world)
if(!A.initialized) //this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
var/start_tick = world.time
A.Initialize(TRUE)
if(start_tick != world.time)
WARNING("[A]: [A.type] slept during it's Initialize!")
CHECK_TICK
initialized = INITIALIZATION_INNEW_REGULAR
/datum/subsystem/objects/proc/map_loader_begin()
old_initialized = initialized
initialized = FALSE
initialized = INITIALIZATION_INSSOBJ
/datum/subsystem/objects/proc/map_loader_stop()
initialized = old_initialized
/datum/subsystem/objects/proc/trigger_atom_spawners(zlevel, ignore_z=FALSE)
for(var/V in atom_spawners)
var/atom/A = V
if (!ignore_z && (zlevel && A.z != zlevel))
continue
A.spawn_atom_to_world()
/datum/subsystem/objects/stat_entry()
..("P:[processing.len]")
@@ -65,18 +75,11 @@ var/datum/subsystem/objects/SSobj
if (MC_TICK_CHECK)
return
/datum/subsystem/objects/proc/setup_template_objects(list/objects)
trigger_atom_spawners(0, ignore_z=TRUE)
if(initialized)
for(var/A in objects)
var/atom/B = A
B.Initialize(TRUE)
/datum/subsystem/objects/Recover()
initialized = SSobj.initialized
if(initialized == INITIALIZATION_INNEW_MAPLOAD)
InitializeAtoms()
old_initialized = SSobj.old_initialized
if (istype(SSobj.atom_spawners))
atom_spawners = SSobj.atom_spawners
if (istype(SSobj.processing))
processing = SSobj.processing