From 396f1eae33f3aa706f27792ad70d0caaa1474141 Mon Sep 17 00:00:00 2001 From: fendrin Date: Fri, 6 Jun 2014 19:32:59 +0200 Subject: [PATCH] Moved mainline core definition file from _main.cfg to /data/cores.cfg. --- _main.cfg => data/cores.cfg | 0 src/game_config_manager.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename _main.cfg => data/cores.cfg (100%) diff --git a/_main.cfg b/data/cores.cfg similarity index 100% rename from _main.cfg rename to data/cores.cfg diff --git a/src/game_config_manager.cpp b/src/game_config_manager.cpp index 8c80e7cca44..b63bfd4a94d 100644 --- a/src/game_config_manager.cpp +++ b/src/game_config_manager.cpp @@ -127,7 +127,7 @@ void game_config_manager::load_game_config(FORCE_RELOAD_CONFIG force_reload, cache_.get_config(get_wml_location(preferences::wml_tree_root()), game_config_); // Load the mainline core definitions to make sure switching back is always possible. config default_core_cfg; - cache_.get_config(game_config::path, default_core_cfg); + cache_.get_config(game_config::path + "/data/cores.cfg", default_core_cfg); game_config_.append(default_core_cfg); main_transaction.lock();