From 4727d8f73ca7743750b8f2573a99336ef91d394d Mon Sep 17 00:00:00 2001 From: Jordie Date: Sat, 16 Dec 2017 03:00:35 +1100 Subject: [PATCH 1/2] Fixes LoadEntries return value --- .../configuration/configuration.dm | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index e9c0aa71b8..095e60132c 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -22,8 +22,16 @@ GLOBAL_PROTECT(config_dir) config = src var/list/config_files = InitEntries() LoadModes() +<<<<<<< HEAD for(var/I in config_files) LoadEntries(I) +======= + if(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") +>>>>>>> 5cf2c42... Merge pull request #33562 from tgstation/Cyberboss-patch-1 loadmaplist(CONFIG_MAPS_FILE) /datum/controller/configuration/Destroy() @@ -91,6 +99,17 @@ GLOBAL_PROTECT(config_dir) if(!entry) continue +<<<<<<< HEAD +======= + if(entry == "$include") + if(!value) + log_config("Warning: Invalid $include directive: [value]") + else + LoadEntries(value, stack) + ++. + continue + +>>>>>>> 5cf2c42... Merge pull request #33562 from tgstation/Cyberboss-patch-1 var/datum/config_entry/E = _entries[entry] if(!E) log_config("Unknown setting in configuration: '[entry]'") @@ -111,6 +130,11 @@ GLOBAL_PROTECT(config_dir) if(validated) E.modified = TRUE +<<<<<<< HEAD +======= + + ++. +>>>>>>> 5cf2c42... Merge pull request #33562 from tgstation/Cyberboss-patch-1 /datum/controller/configuration/can_vv_get(var_name) return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..() From 26543ea97f601c5d9b531be300ef4ddb473207dd Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 17:50:43 -0600 Subject: [PATCH 2/2] Update configuration.dm --- code/controllers/configuration/configuration.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 095e60132c..ef855c854a 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -22,16 +22,11 @@ GLOBAL_PROTECT(config_dir) config = src var/list/config_files = InitEntries() LoadModes() -<<<<<<< HEAD - for(var/I in config_files) - LoadEntries(I) -======= if(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") ->>>>>>> 5cf2c42... Merge pull request #33562 from tgstation/Cyberboss-patch-1 loadmaplist(CONFIG_MAPS_FILE) /datum/controller/configuration/Destroy() @@ -98,9 +93,6 @@ GLOBAL_PROTECT(config_dir) if(!entry) continue - -<<<<<<< HEAD -======= if(entry == "$include") if(!value) log_config("Warning: Invalid $include directive: [value]") @@ -109,7 +101,6 @@ GLOBAL_PROTECT(config_dir) ++. continue ->>>>>>> 5cf2c42... Merge pull request #33562 from tgstation/Cyberboss-patch-1 var/datum/config_entry/E = _entries[entry] if(!E) log_config("Unknown setting in configuration: '[entry]'") @@ -130,11 +121,8 @@ GLOBAL_PROTECT(config_dir) if(validated) E.modified = TRUE -<<<<<<< HEAD -======= ++. ->>>>>>> 5cf2c42... Merge pull request #33562 from tgstation/Cyberboss-patch-1 /datum/controller/configuration/can_vv_get(var_name) return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..()