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

refactor: Change variable type of aircraftNumber

Browse Source 
The aircraft number should always be positive
This commit is contained in:
Lars Toenning
2024-01-04 22:38:00 +01:00
parent 4b05c4200d
commit 78d0dc4435
15 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -524,7 +524,7 @@ namespace BlackSimPlugin::Emulated
{
const qint64 now = QDateTime::currentMSecsSinceEpoch();
const bool updateAllAircraft = this->isUpdateAllRemoteAircraft(now);
int aircraftNumber = 0;
uint32_t aircraftNumber = 0;
for (const CSimulatedAircraft &aircraft : m_renderedAircraft)
{

2
src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackSimPlugin::Flightgear
m_interpolator->attachLogger(logger);
}
CInterpolationResult CFlightgearMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const
CInterpolationResult CFlightgearMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const
{
Q_ASSERT(m_interpolator);
return m_interpolator->getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber);

2
src/plugins/simulator/flightgear/flightgearmpaircraft.h
View File

@@ -57,7 +57,7 @@ namespace BlackSimPlugin::Flightgear
void attachInterpolatorLogger(BlackMisc::Simulation::CInterpolationLogger *logger) const;
//! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolation
BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const;
BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const;
//! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolationMessages
BlackMisc::CStatusMessageList getInterpolationMessages(BlackMisc::Simulation::CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;

2
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -637,7 +637,7 @@ namespace BlackSimPlugin::Flightgear
PlanesSurfaces planesSurfaces;
PlanesTransponders planesTransponders;
int aircraftNumber = 0;
uint32_t aircraftNumber = 0;
const bool updateAllAircraft = this->isUpdateAllRemoteAircraft(currentTimestamp);
const CCallsignSet callsignsInRange = this->getAircraftInRangeCallsigns();
for (const CFlightgearMPAircraft &flightgearAircraft : std::as_const(m_flightgearAircraftObjects))

2
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -205,7 +205,7 @@ namespace BlackSimPlugin::FsxCommon
m_interpolator->attachLogger(logger);
}
CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const
CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const
{
if (!m_interpolator)
{

2
src/plugins/simulator/fsxcommon/simconnectobject.h
View File

@@ -275,7 +275,7 @@ namespace BlackSimPlugin::FsxCommon
void attachInterpolatorLogger(BlackMisc::Simulation::CInterpolationLogger *logger) const;
//! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolation
BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const;
BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const;
//! \copydoc BlackMisc::Simulation::CInterpolator::getLastInterpolatedSituation
const BlackMisc::Aviation::CAircraftSituation &getLastInterpolatedSituation(BlackMisc::Simulation::CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -1930,7 +1930,7 @@ namespace BlackSimPlugin::FsxCommon
// interpolation for all remote aircraft
const QList<CSimConnectObject> simObjects(m_simConnectObjects.values());
int simObjectNumber = 0;
uint32_t simObjectNumber = 0;
const bool traceSendId = this->isTracingSendId();
const bool updateAllAircraft = this->isUpdateAllRemoteAircraft(currentTimestamp);
for (const CSimConnectObject &simObject : simObjects)

2
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -918,7 +918,7 @@ namespace BlackSimPlugin::XPlane
PlanesSurfaces planesSurfaces;
PlanesTransponders planesTransponders;
int aircraftNumber = 0;
uint32_t aircraftNumber = 0;
const bool updateAllAircraft = this->isUpdateAllRemoteAircraft(currentTimestamp);
const CCallsignSet callsignsInRange = this->getAircraftInRangeCallsigns();
for (const CXPlaneMPAircraft &xplaneAircraft : std::as_const(m_xplaneAircraftObjects))

2
src/plugins/simulator/xplane/xplanempaircraft.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackSimPlugin::XPlane
m_interpolator->attachLogger(logger);
}
CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const
CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const
{
Q_ASSERT(m_interpolator);
return m_interpolator->getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber);

2
src/plugins/simulator/xplane/xplanempaircraft.h
View File

@@ -57,7 +57,7 @@ namespace BlackSimPlugin::XPlane
void attachInterpolatorLogger(BlackMisc::Simulation::CInterpolationLogger *logger) const;
//! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolation
BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const;
BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const;
//! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolationMessages
BlackMisc::CStatusMessageList getInterpolationMessages(BlackMisc::Simulation::CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;