teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Use data paths from config (bug #4412)

Browse source
This commit is contained in:
tri4ng1e 2018-05-11 17:24:36 +03:00
parent 103a07b744
commit 9126e844bf
No known key found for this signature in database
GPG key ID: A3E3103F4E24BEA5
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/mwiniimporter/importer.cpp
View file

@ -873,8 +873,20 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
std::time_t defaultTime = 0;
ToUTF8::Utf8Encoder encoder(mEncoding);
// assume the Game Files are all in a "Data Files" directory under the directory holding Morrowind.ini
const boost::filesystem::path gameFilesDir(iniFilename.parent_path() /= "Data Files");
std::vector<boost::filesystem::path> dataPaths;
if (cfg.count("data"))
{
for (std::string filePathString : cfg["data"])
{
if (filePathString.front() == '"')
{
filePathString.erase(filePathString.begin());
filePathString.erase(filePathString.end() - 1);
}
dataPaths.emplace_back(filePathString);
}
}
dataPaths.push_back(iniFilename.parent_path() /= "Data Files");
multistrmap::const_iterator it = ini.begin();
for (int i=0; it != ini.end(); i++)
@ -893,9 +905,20 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
if(filetype.compare("esm") == 0 || filetype.compare("esp") == 0)
{
boost::filesystem::path filepath(gameFilesDir);
filepath /= *entry;
contentFiles.push_back({lastWriteTime(filepath, defaultTime), filepath});
bool found = false;
for (auto & dataPath : dataPaths)
{
boost::filesystem::path path = dataPath / *entry;
std::time_t time = lastWriteTime(path, defaultTime);
if (time != defaultTime)
{
contentFiles.push_back({time, path});
found = true;
break;
}
}
if (!found)
std::cout << "Warning: " << *entry << " not found, ignoring" << std::endl;
}
}
}
@ -981,9 +1004,5 @@ std::time_t MwIniImporter::lastWriteTime(const boost::filesystem::path& filename
std::cout << "content file: " << resolved << " timestamp = (" << writeTime <<
") " << timeStrBuffer << std::endl;
}
else
{
std::cout << "content file: " << filename << " not found" << std::endl;
}
return writeTime;
}