From 4d610b95bdfdb377f2ef7eb0f67eff02920f4595 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 1 Oct 2017 16:27:23 -0400 Subject: [PATCH] Maplist is loaded regardless of maprotation config setting (#31172) * Uncomments map rotation in default config * Maplist is loaded regardless of maprotation config setting Also logs loading of the map file --- code/controllers/configuration/configuration.dm | 4 ++-- config/config.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 8df012e5de..49ccb411fc 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -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 diff --git a/config/config.txt b/config/config.txt index 079ec0d9c6..d5d2725714 100644 --- a/config/config.txt +++ b/config/config.txt @@ -286,7 +286,7 @@ ANNOUNCE_ADMIN_LOGOUT ## Map rotation ## You should edit maps.txt to match your configuration when you enable this. -#MAPROTATION +MAPROTATION ## Map voting ## Allows players to vote for their preffered map