flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 02:08:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T732, improved simulator type resolution for network

Browse Source
This commit is contained in:
Klaus Basan
2019-09-28 23:08:53 +02:00
committed by Mat Sutcliffe
parent 1ffedcb252
commit 9a4fe0ea48
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/fsd/fsdclient.cpp
View File

@@ -173,25 +173,15 @@ namespace BlackCore
void CFSDClient::setSimType(const CSimulatorPluginInfo &simInfo) void CFSDClient::setSimType(const CSimulatorPluginInfo &simInfo)
{ {
//! \fixme Define recognized simulators somewhere */ //! \fixme Define recognized simulators somewhere */
if (simInfo.getSimulator() == "fs9") const CSimulatorInfo::Simulator sim = simInfo.getSimulatorInfo().getSimulator();
switch (sim)
{ {
m_simType = SimType::MSFS2004; case CSimulatorInfo::FSX: m_simType = SimType::MSFSX; break;
} case CSimulatorInfo::P3D: m_simType = SimType::P3Dv4; break;
else if (simInfo.getSimulator() == "fsx") case CSimulatorInfo::FS9: m_simType = SimType::MSFS2004; break;
{ case CSimulatorInfo::FG: m_simType = SimType::FlightGear; break;
m_simType = SimType::MSFSX; case CSimulatorInfo::XPLANE: m_simType = SimType::XPLANE11; break;
} default: m_simType = SimType::Unknown; break;
else if (simInfo.getSimulator() == "p3d")
{
m_simType = SimType::P3Dv4;
}
else if (simInfo.getSimulator() == "xplane")
{
m_simType = SimType::XPLANE11;
}
else
{
m_simType = SimType::Unknown;
} }
} }

2
src/blackmisc/simulation/simulatorinfo.h
View File

@@ -199,7 +199,7 @@ namespace BlackMisc
static CSimulatorInfo fromDatabaseJson(const QJsonObject &json, const QString &prefix); static CSimulatorInfo fromDatabaseJson(const QJsonObject &json, const QString &prefix);
//! Const simulator info objects @{ //! Const simulator info objects @{
static const CSimulatorInfo &fg() { static const CSimulatorInfo s(FG); return s; } static const CSimulatorInfo &fg() { static const CSimulatorInfo s(FG); return s; }
static const CSimulatorInfo &fsx() { static const CSimulatorInfo s(FSX); return s; } static const CSimulatorInfo &fsx() { static const CSimulatorInfo s(FSX); return s; }
static const CSimulatorInfo &p3d() { static const CSimulatorInfo s(P3D); return s; } static const CSimulatorInfo &p3d() { static const CSimulatorInfo s(P3D); return s; }
static const CSimulatorInfo &fs9() { static const CSimulatorInfo s(FS9); return s; } static const CSimulatorInfo &fs9() { static const CSimulatorInfo s(FS9); return s; }