From f3e9fd49f326cb3fcd65bd8ee128c555ff3045a2 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sun, 17 Apr 2016 17:15:13 +0200 Subject: [PATCH] Don't add the autodetected mw path in global config file The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem. --- components/files/configurationmanager.cpp | 2 -- files/openmw.cfg | 1 - files/openmw.cfg.local | 1 - 3 files changed, 4 deletions(-) diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 9c9cebe96..5ac3dd695 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -22,7 +22,6 @@ static const char* const applicationName = "OpenMW"; static const char* const applicationName = "openmw"; #endif -const char* const mwToken = "?mw?"; const char* const localToken = "?local?"; const char* const userDataToken = "?userdata?"; const char* const globalToken = "?global?"; @@ -45,7 +44,6 @@ ConfigurationManager::~ConfigurationManager() void ConfigurationManager::setupTokensMapping() { - mTokensMapping.insert(std::make_pair(mwToken, &FixedPath<>::getInstallPath)); mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath)); mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath)); mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath)); diff --git a/files/openmw.cfg b/files/openmw.cfg index 3a9bd8762..199e09403 100644 --- a/files/openmw.cfg +++ b/files/openmw.cfg @@ -2,7 +2,6 @@ # Modifications should be done on the user openmw.cfg file instead # (see: https://wiki.openmw.org/index.php?title=Paths) -data="?mw?Data Files" data=${MORROWIND_DATA_FILES} data-local="?userdata?data" resources=${OPENMW_RESOURCE_FILES} diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local index 71cd3bfbf..0640ec843 100644 --- a/files/openmw.cfg.local +++ b/files/openmw.cfg.local @@ -3,7 +3,6 @@ # (see: https://wiki.openmw.org/index.php?title=Paths) data="?global?data" -data="?mw?Data Files" data=./data data-local="?userdata?data" resources=./resources