shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4753 from Citadel-Station-13/upstream-merge-34290

Browse Source 
[MIRROR] Fixes configuration not loading
This commit is contained in:
deathride58
2018-01-12 00:42:01 +00:00
committed by GitHub
parent c0072cf15f 4ac9269cdf
commit 048a321f72
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/configuration.dm
+1 -1
View File
@@ -22,7 +22,7 @@ GLOBAL_PROTECT(config_dir)
config = src config = src
InitEntries() InitEntries()
LoadModes() LoadModes()
if(LoadEntries("config.txt") <= 1) if(fexists("config/config.txt") && 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")