mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 18:19:55 +00:00
re-enabling support for multiple data directories
This commit is contained in:
parent
f9693ab33a
commit
b0506e2220
2 changed files with 3 additions and 9 deletions
|
@ -207,15 +207,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
|
|||
std::string local(variables["data-local"].as<std::string>());
|
||||
if (!local.empty())
|
||||
{
|
||||
std::cout << "Ignoring data-local (currently not supported)" << std::endl;
|
||||
// dataDirs.push_back(Files::PathContainer::value_type(local));
|
||||
}
|
||||
|
||||
if (dataDirs.size()>1)
|
||||
{
|
||||
dataDirs.resize (1);
|
||||
std::cout << "Ignoring all but the first data path (multiple data paths currently not supported)"
|
||||
<< std::endl;
|
||||
dataDirs.push_back(Files::PathContainer::value_type(local));
|
||||
}
|
||||
|
||||
cfgMgr.processPaths(dataDirs);
|
||||
|
|
|
@ -1,2 +1,4 @@
|
|||
data="?global?"data"
|
||||
data="?mw?Data Files"
|
||||
data-local="?local?data"
|
||||
resources=${MORROWIND_RESOURCE_FILES}
|
||||
|
|
Loading…
Reference in a new issue