flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-01 22:55:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect integer signedness in FS9 SDK

Browse Source 
refs #790
This commit is contained in:
Roland Winklmeier
2016-11-04 01:41:03 +01:00
committed by Klaus Basan
parent 5035e7b5fb
commit 5d7eff0797
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/simulator/fs9/fs9.h
View File

@@ -139,7 +139,7 @@ namespace BlackSimPlugin
//! Reduced multiplayer position packet //! Reduced multiplayer position packet
struct REDUCED_LLAPBH_DATA struct REDUCED_LLAPBH_DATA
{ {
qint32 pbh = 0; //!< Struct pitch/bank/heading quint32 pbh = 0; //!< Struct pitch/bank/heading
qint32 lat_i = 0; //!< Latitude value - integer part qint32 lat_i = 0; //!< Latitude value - integer part
qint32 lon_hi = 0; //!< Longitude value - integer part qint32 lon_hi = 0; //!< Longitude value - integer part
qint32 alt_i = 0; //!< Altitude value - integer part qint32 alt_i = 0; //!< Altitude value - integer part
@@ -156,7 +156,7 @@ namespace BlackSimPlugin
quint32 application_time = 0; //!< Application time - ignored quint32 application_time = 0; //!< Application time - ignored
quint32 packet_index = 0; //!< Packet index 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
qint32 pbh = 0; //!< Pitch/Bank/Heading quint32 pbh = 0; //!< Pitch/Bank/Heading
qint32 lat_i = 0; //!< Latitude - integer qint32 lat_i = 0; //!< Latitude - integer
qint32 lon_hi = 0; //!< Longitude - integer qint32 lon_hi = 0; //!< Longitude - integer
qint32 alt_i = 0; //!< Altitude - integer qint32 alt_i = 0; //!< Altitude - integer
@@ -178,7 +178,7 @@ namespace BlackSimPlugin
qint32 alt_velocity = 0; //!< Altitude velocity qint32 alt_velocity = 0; //!< Altitude velocity
quint32 ground_velocity = 0; //!< Ground velocity quint32 ground_velocity = 0; //!< Ground velocity
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
qint32 pbh = 0; //!< Pitch/Bank/Heading quint32 pbh = 0; //!< Pitch/Bank/Heading
qint32 lat_i = 0; //!< Latitude - integer qint32 lat_i = 0; //!< Latitude - integer
qint32 lon_hi = 0; //!< Longitude - integer qint32 lon_hi = 0; //!< Longitude - integer
qint32 alt_i = 0; //!< Altitude - integer qint32 alt_i = 0; //!< Altitude - integer
@@ -222,8 +222,8 @@ namespace BlackSimPlugin
unsigned int unused : 1; //!< unused bit unsigned int unused : 1; //!< unused bit
unsigned int onground : 1; //!< Onground flag unsigned int onground : 1; //!< Onground flag
unsigned int hdg : 10; //!< Heading unsigned int hdg : 10; //!< Heading
unsigned int bank : 10; //!< Bank int bank : 10; //!< Bank
unsigned int pitch : 10; //!< Pitch int pitch : 10; //!< Pitch
}; };
}; };
} }

6
src/plugins/simulator/fs9/multiplayerpackets.h
View File

@@ -101,7 +101,7 @@ namespace BlackSimPlugin
//! Return tuple of member variables //! Return tuple of member variables
std::tuple<quint32 &, quint32 &, std::tuple<quint32 &, quint32 &,
quint8 &, quint8 &, quint8 &, quint8 &, quint8 &, quint8 &, quint8 &, quint8 &,
qint32 &, qint32 &, qint32 &, qint32 &, quint32 &, qint32 &, qint32 &, qint32 &,
quint16 &, quint16 &, quint16 &> getTuple() quint16 &, quint16 &, quint16 &> getTuple()
{ {
return std::tie(application_time, packet_index, return std::tie(application_time, packet_index,
@@ -113,7 +113,7 @@ namespace BlackSimPlugin
//! Return const tuple of member variables //! Return const tuple of member variables
std::tuple<const quint32 &, const quint32 &, std::tuple<const quint32 &, const quint32 &,
const quint8 &, const quint8 &, const quint8 &, const quint8 &, const quint8 &, const quint8 &, const quint8 &, const quint8 &,
const qint32 &, const qint32 &, const qint32 &, const qint32 &, const quint32 &, const qint32 &, const qint32 &, const qint32 &,
const quint16 &, const quint16 &, const quint16 &> getTuple() const const quint16 &, const quint16 &, const quint16 &> getTuple() const
{ {
return std::tie(application_time, packet_index, return std::tie(application_time, packet_index,
@@ -132,7 +132,7 @@ namespace BlackSimPlugin
//! Return tuple of member variables //! Return tuple of member variables
std::tuple<quint32 &, quint32 &, qint32 &, qint32 &, qint32 &, std::tuple<quint32 &, quint32 &, qint32 &, qint32 &, qint32 &,
quint32 &, quint8 &, quint8 &, quint8 &, quint32 &, quint8 &, quint8 &, quint8 &,
quint8 &, qint32 &, qint32 &, qint32 &, quint8 &, quint32 &, qint32 &, qint32 &,
qint32 &, quint16 &, quint16 &, qint32 &, quint16 &, quint16 &,
quint16 &> getTuple() quint16 &> getTuple()
{ {