cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-14 03:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes LoadEntries return value

Browse Source
This commit is contained in:
Jordan Brown
2017-12-15 10:50:58 -05:00
committed by GitHub
parent c8d7d46eef
commit 059a07aac6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ GLOBAL_PROTECT(config_dir)
config = src config = src
InitEntries() InitEntries()
LoadModes() 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...") log_config("No $include directives found in config.txt! Loading legacy game_options/dbconfig/comms files...")
LoadEntries("game_options.txt") LoadEntries("game_options.txt")
LoadEntries("dbconfig.txt") LoadEntries("dbconfig.txt")
@@ -103,6 +103,7 @@ GLOBAL_PROTECT(config_dir)
log_config("Warning: Invalid $include directive: [value]") log_config("Warning: Invalid $include directive: [value]")
else else
LoadEntries(value, stack) LoadEntries(value, stack)
++.
continue continue
var/datum/config_entry/E = _entries[entry] var/datum/config_entry/E = _entries[entry]
@@ -124,7 +125,7 @@ GLOBAL_PROTECT(config_dir)
if(validated) if(validated)
E.modified = TRUE E.modified = TRUE
. = TRUE ++.
/datum/controller/configuration/can_vv_get(var_name) /datum/controller/configuration/can_vv_get(var_name)
return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..() return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..()