From fae5e6ac0a0263d6c52a25d4d8ecaef5ca78efb4 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 19 Jan 2018 03:14:32 +0100 Subject: [PATCH] Ref T229, FS9 and XPlane adjustments for changed CInterpolationStatus Ref T207, maybe MS should review the XP part --- src/plugins/simulator/fs9/fs9client.cpp | 4 ++-- src/xswiftbus/traffic.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp index 94c6dcf22..7880745fd 100644 --- a/src/plugins/simulator/fs9/fs9client.cpp +++ b/src/plugins/simulator/fs9/fs9client.cpp @@ -188,8 +188,8 @@ namespace BlackSimPlugin hints.setLoggingInterpolation(this->getInterpolationSetup().getLogCallsigns().contains(m_callsign)); const CAircraftSituation situation = m_interpolator.getInterpolatedSituation(-1, m_interpolationSetup, hints, status); - // Test only for successful interpolation. FS9 requires constant positions - if (!status.didInterpolationSucceed()) { return; } + // Test only for successful position. FS9 requires constant positions + if (!status.hasValidSituation()) { return; } sendMultiplayerPosition(situation); sendMultiplayerParamaters(); diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index 720570a9a..7edd2a6cb 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -342,8 +342,10 @@ namespace XSwiftBus BlackMisc::Simulation::CInterpolationAndRenderingSetup setup; BlackMisc::Simulation::CInterpolationStatus status; const auto situation = plane->interpolator.getInterpolatedSituation(-1, setup, plane->hints(), status); - if (! status.didInterpolationSucceed()) { return xpmpData_Unavailable; } - if (! status.hasChangedPosition()) { return xpmpData_Unchanged; } + if (! status.hasValidSituation()) { return xpmpData_Unavailable; } + + //! \fixme KB 2018-01 commented out with T229. Change detection needs to go somewhere else + // if (! status.hasChangedPosition()) { return xpmpData_Unchanged; } using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation;