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.
pull/1/head
scrawl 9 years ago
parent 1c89737e09
commit f3e9fd49f3

@ -22,7 +22,6 @@ static const char* const applicationName = "OpenMW";
static const char* const applicationName = "openmw"; static const char* const applicationName = "openmw";
#endif #endif
const char* const mwToken = "?mw?";
const char* const localToken = "?local?"; const char* const localToken = "?local?";
const char* const userDataToken = "?userdata?"; const char* const userDataToken = "?userdata?";
const char* const globalToken = "?global?"; const char* const globalToken = "?global?";
@ -45,7 +44,6 @@ ConfigurationManager::~ConfigurationManager()
void ConfigurationManager::setupTokensMapping() void ConfigurationManager::setupTokensMapping()
{ {
mTokensMapping.insert(std::make_pair(mwToken, &FixedPath<>::getInstallPath));
mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath)); mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath)); mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath)); mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));

@ -2,7 +2,6 @@
# Modifications should be done on the user openmw.cfg file instead # Modifications should be done on the user openmw.cfg file instead
# (see: https://wiki.openmw.org/index.php?title=Paths) # (see: https://wiki.openmw.org/index.php?title=Paths)
data="?mw?Data Files"
data=${MORROWIND_DATA_FILES} data=${MORROWIND_DATA_FILES}
data-local="?userdata?data" data-local="?userdata?data"
resources=${OPENMW_RESOURCE_FILES} resources=${OPENMW_RESOURCE_FILES}

@ -3,7 +3,6 @@
# (see: https://wiki.openmw.org/index.php?title=Paths) # (see: https://wiki.openmw.org/index.php?title=Paths)
data="?global?data" data="?global?data"
data="?mw?Data Files"
data=./data data=./data
data-local="?userdata?data" data-local="?userdata?data"
resources=./resources resources=./resources

Loading…
Cancel
Save