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

Update externals

Browse Source 
* vatlib 0.9.6
* Partially revert 3f975838b2
This commit is contained in:
Klaus Basan
2016-12-04 19:29:02 +01:00
committed by Mathew Sutcliffe
parent ac490eeed7
commit bed1542fe4
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: be1197e132...1051e314bf

2
installer/installbuilder/swift-externals.xml
View File

@@ -72,7 +72,7 @@
<origin>../../dist/lib/libopus.0.dylib</origin> <origin>../../dist/lib/libopus.0.dylib</origin>
</distributionFile> </distributionFile>
<distributionFile> <distributionFile>
<origin>../../dist/lib/libportaudio.2.dylib</origin> <origin>../../dist/lib/libportaudio.dylib</origin>
</distributionFile> </distributionFile>
<distributionFile> <distributionFile>
<origin>../../dist/lib/libspeexdsp.1.dylib</origin> <origin>../../dist/lib/libspeexdsp.1.dylib</origin>

14
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -58,7 +58,7 @@
#include <type_traits> #include <type_traits>
static_assert(! std::is_abstract<BlackCore::Vatsim::CNetworkVatlib>::value, "Must implement all pure virtuals"); static_assert(! std::is_abstract<BlackCore::Vatsim::CNetworkVatlib>::value, "Must implement all pure virtuals");
static_assert(VAT_LIBVATLIB_VERSION == 905, "Wrong vatlib header installed"); static_assert(VAT_LIBVATLIB_VERSION == 906, "Wrong vatlib header installed");
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
@@ -103,7 +103,7 @@ namespace BlackCore
{ {
Q_ASSERT_X(isDisconnected(), Q_FUNC_INFO, "attempted to reinitialize session while still connected"); Q_ASSERT_X(isDisconnected(), Q_FUNC_INFO, "attempted to reinitialize session while still connected");
int clientCapabilities = vatCapsModelDesc | vatCapsInterminPos | vatCapsAtcInfo | vatCapsAircraftConfig; int clientCapabilities = vatCapsAircraftInfo | vatCapsFastPos | vatCapsAtcInfo | vatCapsAircraftConfig;
if (m_loginMode == LoginStealth) if (m_loginMode == LoginStealth)
{ {
clientCapabilities |= vatCapsStealth; clientCapabilities |= vatCapsStealth;
@@ -629,7 +629,7 @@ namespace BlackCore
const QByteArray liverybytes = toFSD(m_ownLiveryDescription); const QByteArray liverybytes = toFSD(m_ownLiveryDescription);
VatAircraftInfo aircraftInfo {acTypeICAObytes, airlineICAObytes, liverybytes}; VatAircraftInfo aircraftInfo {acTypeICAObytes, airlineICAObytes, liverybytes};
Vat_SendModernPlaneInfo(m_net.data(), toFSD(callsign), &aircraftInfo); Vat_SendAircraftInfo(m_net.data(), toFSD(callsign), &aircraftInfo);
} }
void CNetworkVatlib::sendIncrementalAircraftConfig() void CNetworkVatlib::sendIncrementalAircraftConfig()
@@ -805,11 +805,9 @@ namespace BlackCore
void CNetworkVatlib::onPilotPositionUpdate(VatSessionID, const char *callsignChar , const VatPilotPosition *position, void *cbvar) void CNetworkVatlib::onPilotPositionUpdate(VatSessionID, const char *callsignChar , const VatPilotPosition *position, void *cbvar)
{ {
const CCallsign callsign(callsignChar, CCallsign::Aircraft); const CCallsign callsign(callsignChar, CCallsign::Aircraft);
// \todo as of 821 using position->altitudePressure instead of position->altitudeTrue
// if altered in underlying classes, this change needs to be reverted
CAircraftSituation situation( CAircraftSituation situation(
callsign, callsign,
CCoordinateGeodetic(position->latitude, position->longitude, position->altitudePressure), CCoordinateGeodetic(position->latitude, position->longitude, position->altitudeTrue),
CHeading(position->heading, CHeading::True, CAngleUnit::deg()), CHeading(position->heading, CHeading::True, CAngleUnit::deg()),
CAngle(position->pitch, CAngleUnit::deg()), CAngle(position->pitch, CAngleUnit::deg()),
CAngle(position->bank, CAngleUnit::deg()), CAngle(position->bank, CAngleUnit::deg()),
@@ -998,8 +996,8 @@ namespace BlackCore
{ {
int flags = 0; int flags = 0;
if (capabilityFlags & vatCapsAtcInfo) { flags |= AcceptsAtisResponses; } if (capabilityFlags & vatCapsAtcInfo) { flags |= AcceptsAtisResponses; }
if (capabilityFlags & vatCapsInterminPos) { flags |= SupportsInterimPosUpdates; } if (capabilityFlags & vatCapsFastPos) { flags |= SupportsInterimPosUpdates; }
if (capabilityFlags & vatCapsModelDesc) { flags |= SupportsIcaoCodes; } if (capabilityFlags & vatCapsAircraftInfo) { flags |= SupportsIcaoCodes; }
if (capabilityFlags & vatCapsAircraftConfig) { flags |= SupportsAircraftConfigs; } if (capabilityFlags & vatCapsAircraftConfig) { flags |= SupportsAircraftConfigs; }
emit cbvar_cast(cbvar)->capabilitiesReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), flags); emit cbvar_cast(cbvar)->capabilitiesReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), flags);
} }