shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4748 from Citadel-Station-13/upstream-merge-34222

Browse Source 
[MIRROR] Fixes error if next_map.json is missing
This commit is contained in:
LetterJay
2018-01-11 15:14:19 -06:00
committed by GitHub
parent 7c0944560a c5730fd79e
commit 92e8f3cefc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/map_config.dm
+5 -4
View File
@@ -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)