From 2d85e923359e38e0985a48d0c39a2577371aa5b7 Mon Sep 17 00:00:00 2001 From: Mark Suckerberg Date: Thu, 28 Dec 2023 10:27:43 -0600 Subject: [PATCH] sees if the thing has been fixed --- code/controllers/globals.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm index d3346b58ed97..310bbc2d0459 100644 --- a/code/controllers/globals.dm +++ b/code/controllers/globals.dm @@ -13,14 +13,7 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars) GLOB = src var/datum/controller/exclude_these = new - // I know this is dumb but the nested vars list hangs a ref to the datum. This fixes that - var/list/controller_vars = exclude_these.vars.Copy() - controller_vars["vars"] = null - gvars_datum_in_built_vars = controller_vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order)) - -#if DM_VERSION >= 515 && DM_BUILD > 1620 - #warn datum.vars hanging a ref should now be fixed, there should be no reason to remove the vars list from our controller's vars list anymore -#endif + gvars_datum_in_built_vars = exclude_these.vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order)) QDEL_IN(exclude_these, 0) //signal logging isn't ready log_world("[vars.len - gvars_datum_in_built_vars.len] global variables")