From fc2f7b4a122424b697ff9188a3f3d20ade9eb9c8 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 13 Jun 2019 00:27:05 +0200 Subject: [PATCH] Ref T683, move "m_ownAircraftUpdateCycles" one level up so it can be used in FS9 --- src/plugins/simulator/fscommon/simulatorfscommon.cpp | 6 ++++++ src/plugins/simulator/fscommon/simulatorfscommon.h | 4 ++++ src/plugins/simulator/fsxcommon/simulatorfsxcommon.h | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index 0d52c5ec7..abede1dd8 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -68,6 +68,12 @@ namespace BlackSimPlugin return CSimulatorPluginCommon::parseDetails(parser); } + void CSimulatorFsCommon::reset() + { + m_ownAircraftUpdateCycles = 0; + ISimulator::reset(); + } + void CSimulatorFsCommon::registerHelp() { if (CSimpleCommandParser::registered("BlackSimPlugin::FsCommon::CSimulatorFsCommon")) { return; } diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 646e3cad0..55cee9c1e 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -75,10 +75,14 @@ namespace BlackSimPlugin //! @} virtual bool parseDetails(const BlackMisc::CSimpleCommandParser &parser) override; + //! \copydoc BlackCore::ISimulator::reset + virtual void reset() override; + //! Register help static void registerHelp(); CFsuipc *m_fsuipc = nullptr; //!< FSUIPC + int m_ownAircraftUpdateCycles = 0; //!< own aircraft updates, even with 50 updates/sec long enough even for 32bit bool m_useFsuipc = false; //!< use FSUIPC bool m_simPaused = false; //!< simulator paused? bool m_simTimeSynced = false; //!< time synchronized? diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index e69fc60c2..4c4253536 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -595,7 +595,6 @@ namespace BlackSimPlugin int m_sbDataReceived = 0; //!< SB3 area data received int m_syncTimeDeferredCounter = 0; //!< Set when synchronized, used to wait some time int m_skipCockpitUpdateCycles = 0; //!< skip some update cycles to allow changes in simulator cockpit to be set - int m_ownAircraftUpdateCycles = 0; //!< own aircraft update // tracing dispatch performance int m_dispatchErrors = 0; //!< number of dispatched failed, \sa dispatch