From d8c3157741286883f88177e16f73f40a5b9cd50c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 11 Jan 2018 01:53:42 -0800 Subject: [PATCH 1/2] Fixes error if next_map.json is missing (#34222) --- code/controllers/subsystem/mapping.dm | 2 +- code/datums/map_config.dm | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 07c08cda55..d13d340b03 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(mapping) #ifdef FORCE_MAP config = new(FORCE_MAP) #else - config = new + config = new(error_if_missing = FALSE) #endif return ..() diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 478109048a..c49c851ac4 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -31,16 +31,17 @@ var/voteweight = 1 var/allow_custom_shuttles = TRUE -/datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after) +/datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after, error_if_missing = TRUE) if(default_to_box) return - LoadConfig(filename) + LoadConfig(filename, error_if_missing) if(delete_after) fdel(filename) -/datum/map_config/proc/LoadConfig(filename) +/datum/map_config/proc/LoadConfig(filename, error_if_missing) if(!fexists(filename)) - log_world("map_config not found: [filename]") + if(error_if_missing) + log_world("map_config not found: [filename]") return var/json = file(filename)