From f85c6bcc30d432748131c4648f9f11c04072e3bd Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 2 Sep 2018 14:36:14 +0200
Subject: [PATCH] Style and check condition

---
 src/plugins/simulator/fs9/fs9.h               | 34 ++++++++++---------
 .../fsxcommon/simulatorfsxcommon.cpp          |  7 ++++
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/plugins/simulator/fs9/fs9.h b/src/plugins/simulator/fs9/fs9.h
index 407e3c2e7..c3e4cdd98 100644
--- a/src/plugins/simulator/fs9/fs9.h
+++ b/src/plugins/simulator/fs9/fs9.h
@@ -58,19 +58,19 @@ namespace BlackSimPlugin
             }
 
             //! Returns the FS9 pitch multiplier
-            static double pitchMultiplier ()
+            static double pitchMultiplier()
             {
                 return 256.0  / 90.0;
             }
 
             //! Return the FS9 bank multiplier
-            static double bankMultiplier ()
+            static double bankMultiplier()
             {
                 return 512.0  / 180.0;
             }
 
             //! Returns the FS9 heading multiplier
-            static double headingMultiplier ()
+            static double headingMultiplier()
             {
                 return 1024.0 / 360.0;
             }
@@ -153,7 +153,7 @@ namespace BlackSimPlugin
         {
             quint32 application_time = 0; //!< Application time - ignored
             quint32 packet_index = 0; //!< Packet index
-            std::array<quint8, 4> reserved = std::array<quint8, 4>{{0, 0, 0, 0}}; //!< Reserved
+            std::array<quint8, 4> reserved = std::array<quint8, 4> {{0, 0, 0, 0}}; //!< Reserved
             quint32 pbh = 0; //!< Pitch/Bank/Heading
             qint32 lat_i = 0; //!< Latitude - integer
             qint32 lon_hi = 0; //!< Longitude - integer
@@ -161,7 +161,7 @@ namespace BlackSimPlugin
             quint16 lat_f = 0; //!< Latitude - fraction
             quint16 lon_lo = 0; //!< Longitude - fraction
             quint16 alt_f = 0; //!< Altitude - fraction
-            std::array<quint8, 2> unknown = std::array<quint8, 2>{{0, 0}}; //!< Unknown packet
+            std::array<quint8, 2> unknown = std::array<quint8, 2> {{0, 0}}; //!< Unknown packet
         };
 
         //! Full multiplayer position and velocity packet
@@ -173,14 +173,14 @@ namespace BlackSimPlugin
             qint32 lon_velocity = 0; //!< Longitude velocity
             qint32 alt_velocity = 0; //!< Altitude velocity
             quint32 ground_velocity = 0; //!< Ground velocity
-            std::array<quint8, 4> reserved = std::array<quint8, 4>{{0, 0, 0, 0}}; //!< Reserved
-            quint32 pbh = 0; //!< Pitch/Bank/Heading
-            qint32 lat_i = 0; //!< Latitude - integer
-            qint32 lon_hi = 0; //!< Longitude - integer
-            qint32 alt_i = 0; //!< Altitude - integer
-            quint16 lat_f = 0; //!< Latitude - fraction
+            std::array<quint8, 4> reserved = std::array<quint8, 4> {{0, 0, 0, 0}}; //!< Reserved
+            quint32 pbh    = 0; //!< Pitch/Bank/Heading
+            qint32 lat_i   = 0; //!< Latitude - integer
+            qint32 lon_hi  = 0; //!< Longitude - integer
+            qint32 alt_i   = 0; //!< Altitude - integer
+            quint16 lat_f  = 0; //!< Latitude - fraction
             quint16 lon_lo = 0; //!< Longitude - fraction
-            quint16 alt_f = 0; //!< Altitude - fraction
+            quint16 alt_f  = 0; //!< Altitude - fraction
         };
 
         //! Player info
@@ -213,16 +213,18 @@ namespace BlackSimPlugin
         union FS_PBH
         {
             unsigned int pbh = 0; //!< Pitch/Bank/Heading as integer value
+
+            //! PBH
             struct
             {
-                unsigned int unused   : 1; //!< unused bit
-                unsigned int onground : 1; //!< Onground flag
+                unsigned int unused   : 1;  //!< unused bit
+                unsigned int onground : 1;  //!< Onground flag
                 unsigned int hdg      : 10; //!< Heading
                 int bank              : 10; //!< Bank
                 int pitch             : 10; //!< Pitch
             };
         };
     }
-}
+} // ns
 
-#endif // BLACKSIMPLUGIN_FS9_FS9SDK_H
+#endif // guard
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 932400c65..9a52fbe97 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -1675,6 +1675,13 @@ namespace BlackSimPlugin
             position.Heading = situation.getHeading().value(CAngleUnit::deg());
             position.Airspeed = static_cast<DWORD>(situation.getGroundSpeed().valueInteger(CSpeedUnit::kts()));
 
+            // sanity check
+            if (CBuildConfig::isLocalDeveloperDebugBuild() && situation.getGroundSpeed().isNegativeWithEpsilonConsidered())
+            {
+                BLACK_VERIFY_X(false, Q_FUNC_INFO, "Negative speed");
+                position.Airspeed = 0;
+            }
+
             // MSFS has inverted pitch and bank angles
             position.Pitch = -situation.getPitch().value(CAngleUnit::deg());
             position.Bank  = -situation.getBank().value(CAngleUnit::deg());