flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enforce *.air file siblings only in 64 bit builds

Browse Source 
P3D ships with aircraft.cfg/sim.cfg models which are not actual aircraft. Only those with an *.air file sibling are actual aircraft models.
However the 32 bit MSFS simulators do not ship with *.air files. Hence enforce it for 64 bit which limits it to 64 bit P3D.
This commit is contained in:
Roland Rossgotterer
2020-10-20 21:00:08 +02:00
committed by Mat Sutcliffe
parent fda0abc94e
commit bd862fa451
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -181,7 +181,7 @@ namespace BlackMisc
const int airFilesCount = dirForAir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::DirsLast).size();
const bool hasAirFiles = airFilesCount > 0;
if (!hasAirFiles)
if (CBuildConfig::buildWordSize() != 32 && !hasAirFiles)
{
const CStatusMessage m = CStatusMessage(this).warning(u"No \"air\" files in '%1'") << currentDir;
messages.push_back(m);
@@ -209,11 +209,8 @@ namespace BlackMisc
}
else
{
if (!hasAirFiles)
{
if (!CBuildConfig::isLocalDeveloperDebugBuild()) { continue; } // "productive versions"
// for testing purposes we continue in dev.versions
}
// Enforce air files only for 64 bit P3D
if (CBuildConfig::buildWordSize() != 32 && !hasAirFiles) { continue; }
// due to the filter we expect only "aircraft.cfg"/"sim.cfg" here
// remark: in a 1st version I have used QSettings to parse to file as ini file
@@ -482,8 +479,16 @@ namespace BlackMisc
const QStringList &CAircraftCfgParser::fileNameFilters()
{
static const QStringList f({ "aircraft.cfg", "sim.cfg" });
return f;
if (CBuildConfig::buildWordSize() == 32)
{
static const QStringList f({ "aircraft.cfg" });
return f;
}
else
{
static const QStringList f({ "aircraft.cfg", "sim.cfg" });
return f;
}
}
bool CAircraftCfgParser::isExcludedSubDirectory(const QString &checkDirectory)