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

Send default model string if model is empty

Browse Source 
For a strange reason swift was sending its own name and
version instead.
This commit is contained in:
Roland Winklmeier
2015-04-11 21:20:21 +02:00
parent 952deb3922
commit e87556a753
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/network_vatlib.cpp
View File

@@ -585,7 +585,7 @@ namespace BlackCore
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected"); Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
CAircraftIcao icao = ownAircraft().getIcaoInfo(); CAircraftIcao icao = ownAircraft().getIcaoInfo();
QString modelString = ownAircraft().getModel().getModelString(); QString modelString = ownAircraft().getModel().getModelString();
if (modelString.isEmpty()) { modelString = CProject::systemNameAndVersion(); } if (modelString.isEmpty()) { modelString = defaultModelString(); }
QStringList data { { "0" }, icao.getAirlineDesignator(), icao.getAircraftDesignator(), QStringList data { { "0" }, icao.getAirlineDesignator(), icao.getAircraftDesignator(),
{ "" }, { "" }, { "" }, { "" }, icao.getAircraftCombinedType(), modelString }; { "" }, { "" }, { "" }, { "" }, icao.getAircraftCombinedType(), modelString };
@@ -597,7 +597,7 @@ namespace BlackCore
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected"); Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
CAircraftIcao icao = ownAircraft().getIcaoInfo(); CAircraftIcao icao = ownAircraft().getIcaoInfo();
QString modelString = ownAircraft().getModel().getModelString(); QString modelString = ownAircraft().getModel().getModelString();
if (modelString.isEmpty()) { modelString = CProject::systemNameAndVersion(); } if (modelString.isEmpty()) { modelString = defaultModelString(); }
QStringList data { { "0" }, icao.getAirlineDesignator(), icao.getAircraftDesignator(), QStringList data { { "0" }, icao.getAirlineDesignator(), icao.getAircraftDesignator(),
{ "" }, { "" }, { "" }, { "" }, icao.getAircraftCombinedType(), modelString }; { "" }, { "" }, { "" }, { "" }, icao.getAircraftCombinedType(), modelString };

5
src/blackcore/network_vatlib.h
View File

@@ -133,6 +133,11 @@ namespace BlackCore
static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo); static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo);
static void networkLogHandler(SeverityLevel severity, const char *message); static void networkLogHandler(SeverityLevel severity, const char *message);
inline QString defaultModelString()
{
return QStringLiteral("Cessna Skyhawk 172SP");
}
struct JsonPackets struct JsonPackets
{ {
static QJsonObject aircraftConfigRequest(); static QJsonObject aircraftConfigRequest();