From f7924732c082e90d3536791f1e26605e9c6ea9ef Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 15 Jun 2018 04:43:15 -0500 Subject: [PATCH] [MIRROR] Legacy config warning only happens if any legacy configs are present (#7089) * Legacy config warning only happens if any legacy configs are present (#38421) * Legacy config warning only happens if any legacy configs are present --- code/controllers/configuration/configuration.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 0f662ad97d..25b3a46fa0 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -25,10 +25,13 @@ InitEntries() LoadModes() if(fexists("[directory]/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") - LoadEntries("comms.txt") + var/list/legacy_configs = list("game_options.txt", "dbconfig.txt", "comms.txt") + for(var/I in legacy_configs) + if(fexists("[directory]/[I]")) + log_config("No $include directives found in config.txt! Loading legacy [legacy_configs.Join("/")] files...") + for(var/J in legacy_configs) + LoadEntries(J) + break loadmaplist(CONFIG_MAPS_FILE) LoadMOTD()