flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #920 X-Plane support in CSimulatorInfo::getLocallyInstalledSimulators.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-03-21 01:52:17 +00:00
parent cbec4fe20d
commit 55b738e65c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -12,6 +12,7 @@
#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h" #include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include <QJsonValue> #include <QJsonValue>
#include <QtGlobal> #include <QtGlobal>
@@ -21,6 +22,7 @@ using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Db; using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Simulation::XPlane;
namespace BlackMisc namespace BlackMisc
{ {
@@ -226,7 +228,6 @@ namespace BlackMisc
bool fs9 = false; bool fs9 = false;
bool fsx = false; bool fsx = false;
bool p3d = false; bool p3d = false;
bool xp = false;
if (CBuildConfig::isRunningOnWindowsNtPlatform()) if (CBuildConfig::isRunningOnWindowsNtPlatform())
{ {
@@ -244,7 +245,7 @@ namespace BlackMisc
!CFsCommonUtil::p3dSimObjectsDir().isEmpty(); !CFsCommonUtil::p3dSimObjectsDir().isEmpty();
} }
xp = true; //! \todo XP resolution for locally installed simulator const bool xp = !CXPlaneUtil::xplaneRootDir().isEmpty();
sim.setSimulator(CSimulatorInfo::boolToFlag(fsx, fs9, xp, p3d)); sim.setSimulator(CSimulatorInfo::boolToFlag(fsx, fs9, xp, p3d));
return sim; return sim;