re-enabling support for multiple data directories

actorid
Marc Zinnschlag 13 years ago
parent f9693ab33a
commit b0506e2220

@ -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…
Cancel
Save