mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

re-enabled local data directory support in launcher

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-09-04 11:02:18 +02:00
parent b0506e2220
commit 2284d76307
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/launcher/datafilespage.cpp
View File

@ -197,7 +197,7 @@ bool DataFilesPage::setupDataFiles()
desc.add_options() desc.add_options()
("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken()) ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken())
// ("data-local", boost::program_options::value<std::string>()->default_value("")) ("data-local", boost::program_options::value<std::string>()->default_value(""))
("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false)) ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
("encoding", boost::program_options::value<std::string>()->default_value("win1252")); ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
@ -206,11 +206,10 @@ bool DataFilesPage::setupDataFiles()
// Put the paths in a boost::filesystem vector to use with Files::Collections // Put the paths in a boost::filesystem vector to use with Files::Collections
mDataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>()); mDataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
// std::string local = variables["data-local"].as<std::string>(); std::string local = variables["data-local"].as<std::string>();
// if (!local.empty()) { if (!local.empty()) {
// mDataLocal.push_back(Files::PathContainer::value_type(local)); mDataLocal.push_back(Files::PathContainer::value_type(local));
// dataDirs.push_back(Files::PathContainer::value_type(local)); }
// }
if (mDataDirs.size()>1) if (mDataDirs.size()>1)
mDataDirs.resize (1); mDataDirs.resize (1);