From 48575ccf7077fc8d4072412cd9bec3a5f250c94b Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 19 Jan 2018 01:26:40 +0000 Subject: [PATCH] Revert "Fix config_dir usage (#34469)" This reverts commit 7be3d32290b9c4d6591660fa1ebfda0383d6a870. --- code/_onclick/hud/credits.dm | 2 +- .../controllers/configuration/configuration.dm | 18 +++++++++--------- code/controllers/subsystem/job.dm | 2 +- code/controllers/subsystem/mapping.dm | 6 +++--- code/controllers/subsystem/ticker.dm | 4 ++-- code/controllers/subsystem/title.dm | 6 +++--- code/datums/ai_laws.dm | 2 +- code/game/objects/items/AI_modules.dm | 2 +- code/game/world.dm | 2 +- code/modules/admin/admin_ranks.dm | 4 ++-- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/whitelist.dm | 2 +- code/modules/awaymissions/zlevel.dm | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm index 702aa1cdcb8..8f20f218ac2 100644 --- a/code/_onclick/hud/credits.dm +++ b/code/_onclick/hud/credits.dm @@ -2,7 +2,7 @@ #define CREDIT_SPAWN_SPEED 10 #define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size) #define CREDIT_EASE_DURATION 22 -#define CREDITS_PATH "[global.config.directory]/contributors.dmi" +#define CREDITS_PATH "[GLOB.config_dir]contributors.dmi" /client/proc/RollCredits() set waitfor = FALSE diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 8db99180dd0..6e2a050fd07 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -1,8 +1,9 @@ +GLOBAL_VAR_INIT(config_dir, "config/") +GLOBAL_PROTECT(config_dir) + /datum/controller/configuration name = "Configuration" - var/directory = "config" - var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it var/list/entries var/list/entries_by_type @@ -23,7 +24,7 @@ config = src InitEntries() LoadModes() - if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1) + if(fexists("config/config.txt") && LoadEntries("config.txt") <= 1) log_config("No $include directives found in config.txt! Loading legacy game_options/dbconfig/comms files...") LoadEntries("game_options.txt") LoadEntries("dbconfig.txt") @@ -73,7 +74,7 @@ stack = stack + filename_to_test log_config("Loading config file [filename]...") - var/list/lines = world.file2list("[directory]/[filename]") + var/list/lines = world.file2list("[GLOB.config_dir][filename]") var/list/_entries = entries for(var/L in lines) if(!L) @@ -130,11 +131,10 @@ ++. /datum/controller/configuration/can_vv_get(var_name) - return (var_name != NAMEOF(src, entries_by_type) || !hiding_entries_by_type) && ..() + return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..() /datum/controller/configuration/vv_edit_var(var_name, var_value) - var/list/banned_edits = list(NAMEOF(src, entries_by_type), NAMEOF(src, entries), NAMEOF(src, directory)) - return !(var_name in banned_edits) && ..() + return !(var_name in list("entries_by_type", "entries")) && ..() /datum/controller/configuration/stat_entry() if(!statclick) @@ -196,14 +196,14 @@ votable_modes += "secret" /datum/controller/configuration/proc/LoadMOTD() - motd = file2text("[directory]/motd.txt") + motd = file2text("[GLOB.config_dir]/motd.txt") var/tm_info = GLOB.revdata.GetTestMergeInfo() if(motd || tm_info) motd = motd ? "[motd]
[tm_info]" : tm_info /datum/controller/configuration/proc/loadmaplist(filename) log_config("Loading config file [filename]...") - filename = "[directory]/[filename]" + filename = "[GLOB.config_dir][filename]" var/list/Lines = world.file2list(filename) var/datum/map_config/currentmap = null diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 4e185300c24..5e780731a30 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -443,7 +443,7 @@ SUBSYSTEM_DEF(job) /datum/controller/subsystem/job/proc/LoadJobs() - var/jobstext = file2text("[global.config.directory]/jobs.txt") + var/jobstext = file2text("config/jobs.txt") for(var/datum/job/J in occupations) var/regex/jobs = new("[J.title]=(-1|\\d+),(-1|\\d+)") jobs.Find(jobstext) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index efce03f0821..8046dab41e3 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -229,8 +229,8 @@ GLOBAL_LIST_EMPTY(the_station_areas) /datum/controller/subsystem/mapping/proc/preloadRuinTemplates() // Still supporting bans by filename - var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt") - banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt") + var/list/banned = generateMapList("config/lavaruinblacklist.txt") + banned += generateMapList("config/spaceruinblacklist.txt") for(var/item in sortList(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority)) var/datum/map_template/ruin/ruin_type = item @@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) space_ruins_templates[R.name] = R /datum/controller/subsystem/mapping/proc/preloadShuttleTemplates() - var/list/unbuyable = generateMapList("[global.config.directory]/unbuyableshuttles.txt") + var/list/unbuyable = generateMapList("config/unbuyableshuttles.txt") for(var/item in subtypesof(/datum/map_template/shuttle)) var/datum/map_template/shuttle/shuttle_type = item diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index eab8da98679..4e7c41d1400 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -82,7 +82,7 @@ SUBSYSTEM_DEF(ticker) "aiff" = TRUE ) - var/list/provisional_title_music = flist("[global.config.directory]/title_music/sounds/") + var/list/provisional_title_music = flist("config/title_music/sounds/") var/list/music = list() var/use_rare_music = prob(1) @@ -118,7 +118,7 @@ SUBSYSTEM_DEF(ticker) music = world.file2list(ROUND_START_MUSIC_LIST, "\n") login_music = pick(music) else - login_music = "[global.config.directory]/title_music/sounds/[pick(music)]" + login_music = "config/title_music/sounds/[pick(music)]" if(!GLOB.syndicate_code_phrase) diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 94dff9b7425..6445ea2fbc1 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(title) previous_icon = new(previous_icon) fdel("data/previous_title.dat") - var/list/provisional_title_screens = flist("[global.config.directory]/title_screens/images/") + var/list/provisional_title_screens = flist("config/title_screens/images/") var/list/title_screens = list() var/use_rare_screens = prob(1) @@ -27,8 +27,8 @@ SUBSYSTEM_DEF(title) title_screens += S if(length(title_screens)) - file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]" - + file_path = "config/title_screens/images/[pick(title_screens)]" + if(!file_path) file_path = "icons/default_title.dmi" diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index e45ff4535b2..c12a08a7928 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -190,7 +190,7 @@ /datum/ai_laws/custom/New() //This reads silicon_laws.txt and allows server hosts to set custom AI starting laws. ..() - for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt")) + for(var/line in world.file2list("config/silicon_laws.txt")) if(!line) continue if(findtextEx(line,"#",1,2)) diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 919bea60b4b..9cc28a1b4b7 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -400,7 +400,7 @@ AI MODULES /obj/item/aiModule/core/full/custom/Initialize() . = ..() - for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt")) + for(var/line in world.file2list("config/silicon_laws.txt")) if(!line) continue if(findtextEx(line,"#",1,2)) diff --git a/code/game/world.dm b/code/game/world.dm index 574875d996f..33dad9a72b1 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -43,7 +43,7 @@ GLOBAL_PROTECT(security_mode) /world/proc/SetupExternalRSC() #if (PRELOAD_RSC == 0) - GLOB.external_rsc_urls = world.file2list("[global.config.directory]/external_rsc_urls.txt","\n") + GLOB.external_rsc_urls = world.file2list("config/external_rsc_urls.txt","\n") var/i=1 while(i<=GLOB.external_rsc_urls.len) if(GLOB.external_rsc_urls[i]) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 6824171f802..7332eab8d05 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -122,7 +122,7 @@ GLOBAL_PROTECT(admin_ranks) if(CONFIG_GET(flag/admin_legacy_system)) var/previous_rights = 0 //load text from file and process each line separately - for(var/line in world.file2list("[global.config.directory]/admin_ranks.txt")) + for(var/line in world.file2list("config/admin_ranks.txt")) if(!line) continue if(findtextEx(line,"#",1,2)) @@ -195,7 +195,7 @@ GLOBAL_PROTECT(admin_ranks) if(CONFIG_GET(flag/admin_legacy_system)) //load text from file - var/list/lines = world.file2list("[global.config.directory]/admins.txt") + var/list/lines = world.file2list("config/admins.txt") //process each line separately for(var/line in lines) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 8d24e92e81f..491d058feae 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -19,7 +19,7 @@ if (!msg) return - var/static/nicknames = world.file2list("[global.config.directory]/admin_nicknames.txt") + var/static/nicknames = world.file2list("config/admin_nicknames.txt") var/rendered = "DEAD: ADMIN([src.holder.fakekey ? pick(nicknames) : src.key]) says, \"[msg]\"" diff --git a/code/modules/admin/whitelist.dm b/code/modules/admin/whitelist.dm index 55206f6debb..082936e0e85 100644 --- a/code/modules/admin/whitelist.dm +++ b/code/modules/admin/whitelist.dm @@ -1,4 +1,4 @@ -#define WHITELISTFILE "[global.config.directory]/whitelist.txt" +#define WHITELISTFILE "config/whitelist.txt" GLOBAL_LIST(whitelist) GLOBAL_PROTECT(whitelist) diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index a8f68511515..b321b8ae945 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -1,5 +1,5 @@ // How much "space" we give the edge of the map -GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.config.directory]/awaymissionconfig.txt")) +GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/awaymissionconfig.txt")) /proc/createRandomZlevel() if(GLOB.awaydestinations.len) //crude, but it saves another var!