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

Style

Browse Source
This commit is contained in:
Klaus Basan
2018-06-18 19:04:46 +02:00
parent 7cc350974c
commit 65c94cf2c3
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/airspacemonitor.cpp
View File

@@ -961,7 +961,7 @@ namespace BlackCore
}
else
{
// values before updating
// values before updating (i.e. "storing") so the new situation is noty yet considered
const CAircraftSituationList oldSituations = this->remoteAircraftSituations(callsign);
const CAircraftSituationChangeList oldChanges = this->remoteAircraftSituationChanges(callsign);
if (oldSituations.size() > 1)

3
src/blackcore/simulator.cpp
View File

@@ -18,6 +18,7 @@
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Network;
@@ -55,7 +56,7 @@ namespace BlackCore
return false;
}
void ISimulator::callbackReceivedRequestedElevation(const Geo::CElevationPlane &plane, const CCallsign &callsign)
void ISimulator::callbackReceivedRequestedElevation(const CElevationPlane &plane, const CCallsign &callsign)
{
if (this->isShuttingDown()) { return; }

6
src/blackmisc/aviation/aircraftsituationlist.cpp
View File

@@ -58,7 +58,7 @@ namespace BlackMisc
Q_ASSERT_X(m_tsAdjustedSortHint == CAircraftSituationList::AdjustedTimestampLatestFirst || this->isSortedAdjustedLatestFirstWithoutNullPositions(), Q_FUNC_INFO, "Need sorted situations without NULL positions");
const CAircraftSituationChange simpleChange(*this, model.getCG(), model.isVtol(), true, false);
int c = 0;
int c = 0; // changed elevations
bool latest = true;
for (CAircraftSituation &s : *this)
@@ -66,8 +66,8 @@ namespace BlackMisc
const bool set = s.setGroundElevationChecked(elevationPlane, info);
if (set)
{
// change is only valid for the latest situation
// this will do nothing if not appropriate
// simpleChange is only valid for the latest situation
// this will do nothing if not appropriate!
s.guessOnGround(latest ? simpleChange : CAircraftSituationChange::null(), model);
c++;
}

2
src/blackmisc/simulation/interpolationsetuplist.h
View File

@@ -23,7 +23,7 @@ namespace BlackMisc
{
namespace Simulation
{
//! Value object encapsulating a list of distributors.
//! Value object encapsulating a list of setups.
class BLACKMISC_EXPORT CInterpolationSetupList :
public CSequence<CInterpolationAndRenderingSetupPerCallsign>,
public Aviation::ICallsignObjectList<CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList>,