From 059a07aac69a8b75a8b0d6d03d9b1a69a8fa454c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 15 Dec 2017 10:50:58 -0500 Subject: [PATCH] Fixes LoadEntries return value --- code/controllers/configuration/configuration.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index f411bd65d37..fa55c9deb4b 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -22,7 +22,7 @@ GLOBAL_PROTECT(config_dir) config = src InitEntries() LoadModes() - if(!LoadEntries("config.txt")) + 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") @@ -103,6 +103,7 @@ GLOBAL_PROTECT(config_dir) log_config("Warning: Invalid $include directive: [value]") else LoadEntries(value, stack) + ++. continue var/datum/config_entry/E = _entries[entry] @@ -123,8 +124,8 @@ GLOBAL_PROTECT(config_dir) if(validated) E.modified = TRUE - - . = TRUE + + ++. /datum/controller/configuration/can_vv_get(var_name) return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..()