mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 12:45:36 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'lgro/config_fixes'

Browse source
This commit is contained in:
Marc Zinnschlag 2012-02-23 09:28:11 +01:00
commit 5f72199419
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/main.cpp
View file

@ -160,7 +160,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
engine.enableFSStrict(variables["fs-strict"].as<bool>()); engine.enableFSStrict(variables["fs-strict"].as<bool>());
Files::PathContainer dataDirs(variables["data"].as<Files::PathContainer>()); Files::PathContainer dataDirs(variables["data"].as<Files::PathContainer>());
cfgMgr.processPaths(dataDirs);
std::string local(variables["data-local"].as<std::string>()); std::string local(variables["data-local"].as<std::string>());
if (!local.empty()) if (!local.empty())
@ -173,6 +172,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
dataDirs.push_back(cfgMgr.getLocalPath()); dataDirs.push_back(cfgMgr.getLocalPath());
} }
cfgMgr.processPaths(dataDirs);
engine.setDataDirs(dataDirs); engine.setDataDirs(dataDirs);
engine.setResourceDir(variables["resources"].as<std::string>()); engine.setResourceDir(variables["resources"].as<std::string>());

2
components/files/windowspath.cpp
View file

@ -64,7 +64,7 @@ boost::filesystem::path WindowsPath::getLocalPath() const
boost::filesystem::path WindowsPath::getGlobalDataPath() const boost::filesystem::path WindowsPath::getGlobalDataPath() const
{ {
return getGlobalConfigPath(); return getGlobalPath();
} }
boost::filesystem::path WindowsPath::getInstallPath() const boost::filesystem::path WindowsPath::getInstallPath() const