Merge pull request #3066 from Citadel-Station-13/upstream-merge-31172
[MIRROR] Maplist is loaded regardless of maprotation config setting
This commit is contained in:
@@ -24,8 +24,7 @@ GLOBAL_PROTECT(config_dir)
|
||||
LoadModes()
|
||||
for(var/I in config_files)
|
||||
LoadEntries(I)
|
||||
if(Get(/datum/config_entry/flag/maprotation))
|
||||
loadmaplist(CONFIG_MAPS_FILE)
|
||||
loadmaplist(CONFIG_MAPS_FILE)
|
||||
|
||||
/datum/controller/configuration/Destroy()
|
||||
entries_by_type.Cut()
|
||||
@@ -170,6 +169,7 @@ GLOBAL_PROTECT(config_dir)
|
||||
|
||||
/datum/controller/configuration/proc/loadmaplist(filename)
|
||||
filename = "[GLOB.config_dir][filename]"
|
||||
log_config("Loading config file [filename]...")
|
||||
var/list/Lines = world.file2list(filename)
|
||||
|
||||
var/datum/map_config/currentmap = null
|
||||
|
||||
Reference in New Issue
Block a user