cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33562 from tgstation/Cyberboss-patch-1

Browse Source 
Fixes LoadEntries return value
This commit is contained in:
Jordie
2017-12-16 03:00:35 +11:00
committed by GitHub
parent c8d7d46eef 059a07aac6
commit 5cf2c42e4a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/configuration/configuration.dm
View File

@@ -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) && ..()