mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 07:06:43 +00:00
Code Issues Releases Wiki Activity

Fix for processing tokens inside data-local config option.

Browse source 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2012-02-22 23:56:07 +01:00
parent e0206edc44
commit d5f1d7eed7
1 changed files with 2 additions and 1 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>());