Ref T660, unify FSX and P3D directory generation (from config files)

* removed unused functions
* sxSimObjectsDirPlusAddOnXmlSimObjectsPaths
* use simulator directory for FSX (same as P3D)
* renamings
This commit is contained in:
Klaus Basan
2019-07-09 17:03:54 +02:00
parent 20439a90ed
commit 0cda787f7f
6 changed files with 91 additions and 69 deletions

View File

@@ -166,7 +166,7 @@ namespace BlackMisc
CStatusMessageList specificTests;
if (simulator.isMicrosoftOrPrepare3DSimulator() || models.isLikelyFsFamilyModelList())
{
const CStatusMessageList specificTests1 = FsCommon::CFsCommonUtil::validateConfigFiles(models, validModels, invalidModels, ignoreEmpty, stopAtFailedFiles, stopped);
const CStatusMessageList specificTests1 = FsCommon::CFsCommonUtil::validateAircraftConfigFiles(models, validModels, invalidModels, ignoreEmpty, stopAtFailedFiles, stopped);
specificTests.push_back(specificTests1);
if (simulator.isP3D())
@@ -176,7 +176,7 @@ namespace BlackMisc
}
else if (simulator.isFSX())
{
const CStatusMessageList specificTests2 = FsCommon::CFsCommonUtil::validateFSXSimObjectsPath(models, validModels, invalidModels, ignoreEmpty, stopAtFailedFiles, stopped);
const CStatusMessageList specificTests2 = FsCommon::CFsCommonUtil::validateFSXSimObjectsPath(models, validModels, invalidModels, ignoreEmpty, stopAtFailedFiles, stopped, simulatorDir);
specificTests.push_back(specificTests2);
}
}