From b77176e9e86b031bdd3247c5741d12b53d7bb80e Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sun, 10 May 2020 10:11:52 +0100 Subject: [PATCH] Moves config loading to world/New not Master/New --- code/controllers/master.dm | 6 +----- code/game/world.dm | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index f64e566e097..bc48dba53e4 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -62,17 +62,13 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/current_ticklimit = TICK_LIMIT_RUNNING /datum/controller/master/New() - //temporary file used to record errors with loading config, moved to log directory once logging is set up - GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log" - load_configuration() - // Highlander-style: there can only be one! Kill off the old and replace it with the new. - if(!random_seed) random_seed = rand(1, 1e9) rand_seed(random_seed) var/list/_subsystems = list() subsystems = _subsystems + // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(Master != src) if(istype(Master)) Recover() diff --git a/code/game/world.dm b/code/game/world.dm index 762a0be70a8..b57670bb37d 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -8,6 +8,10 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) log_world("World loaded at [time_stamp()]") log_world("[GLOB.vars.len - GLOB.gvars_datum_in_built_vars.len] global variables") + //temporary file used to record errors with loading config, moved to log directory once logging is set up + GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log" + load_configuration() + if(byond_version < RECOMMENDED_VERSION) log_world("Your server's byond version does not meet the recommended requirements for this code. Please update BYOND")