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

[FSD] FSD range can be disabled and range restriction only for VATSIM

Browse Source 
Rational FSC eV does not want restriction
This commit is contained in:
Klaus Basan
2019-11-23 02:17:15 +01:00
committed by Mat Sutcliffe
parent 42648f0c12
commit c104e2105c
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackcore/airspacemonitor.cpp
View File

@@ -453,12 +453,16 @@ namespace BlackCore
void CAirspaceMonitor::setMaxRange(const CLength &range) void CAirspaceMonitor::setMaxRange(const CLength &range)
{ {
int rInt = 125; if (range.isNull() || range.isNegativeWithEpsilonConsidered() || range.isZeroEpsilonConsidered())
if (!range.isNull())
{ {
rInt = range.valueInteger(CLengthUnit::NM()); // off
m_maxDistanceNM = -1;
m_maxDistanceNMHysteresis = -1;
CLogMessage(this).info(u"No airspace range restriction");
return;
} }
const int rInt = range.valueInteger(CLengthUnit::NM());
CLogMessage(this).info(u"Set airspace max. range to %1NM") << rInt; CLogMessage(this).info(u"Set airspace max. range to %1NM") << rInt;
m_maxDistanceNM = rInt; m_maxDistanceNM = rInt;
m_maxDistanceNMHysteresis = qRound(rInt * 1.1); m_maxDistanceNMHysteresis = qRound(rInt * 1.1);
@@ -1139,7 +1143,8 @@ namespace BlackCore
bool CAirspaceMonitor::handleMaxRange(const CAircraftSituation &situation) bool CAirspaceMonitor::handleMaxRange(const CAircraftSituation &situation)
{ {
if (situation.isNull()) { return false; } if (situation.isNull()) { return false; }
if (m_maxDistanceNM < 0) { return true; }
const int distanceNM = this->getOwnAircraft().calculateGreatCircleDistance(situation).valueInteger(CLengthUnit::NM()); const int distanceNM = this->getOwnAircraft().calculateGreatCircleDistance(situation).valueInteger(CLengthUnit::NM());
if (distanceNM > m_maxDistanceNMHysteresis) if (distanceNM > m_maxDistanceNMHysteresis)
{ {
@@ -1196,10 +1201,11 @@ namespace BlackCore
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Empty callsign"); Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Empty callsign");
if (this->isCopilotAircraft(callsign)) { return; } if (this->isCopilotAircraft(callsign)) { return; }
const bool existsInRange = this->isAircraftInRange(callsign);
// range (FSD overload issue) // range (FSD overload issue)
if (!this->handleMaxRange(situation)) { return; } const bool validMaxRange = this->handleMaxRange(situation);
const bool existsInRange = this->isAircraftInRange(callsign); // AFTER valid max.range check!
if (!validMaxRange && !existsInRange) { return; } // not valid at all
// update client info // update client info
this->autoAdjustCientGndCapability(situation); this->autoAdjustCientGndCapability(situation);
@@ -1207,8 +1213,10 @@ namespace BlackCore
// store situation history // store situation history
this->storeAircraftSituation(situation); // updates situation this->storeAircraftSituation(situation); // updates situation
if (!existsInRange) // in case we only have
if (!existsInRange && validMaxRange)
{ {
// NEW aircraft
const bool hasFsInnPacket = m_tempFsInnPackets.contains(callsign); const bool hasFsInnPacket = m_tempFsInnPackets.contains(callsign);
CSimulatedAircraft aircraft; CSimulatedAircraft aircraft;
@@ -1222,7 +1230,7 @@ namespace BlackCore
const CClient client(callsign); const CClient client(callsign);
this->addNewClient(client); this->addNewClient(client);
} }
else else if (existsInRange)
{ {
// update, aircraft already exists // update, aircraft already exists
CPropertyIndexVariantMap vm; CPropertyIndexVariantMap vm;
@@ -1282,6 +1290,13 @@ namespace BlackCore
void CAirspaceMonitor::onConnectionStatusChanged(CConnectionStatus oldStatus, CConnectionStatus newStatus) void CAirspaceMonitor::onConnectionStatusChanged(CConnectionStatus oldStatus, CConnectionStatus newStatus)
{ {
Q_UNUSED(oldStatus) Q_UNUSED(oldStatus)
if (newStatus == CConnectionStatus::Connecting && m_fsdClient)
{
const CServer server = m_fsdClient->getServer();
const bool isVatsim = server.getEcosystem().isSystem(CEcosystem::VATSIM);
const CLength maxRange(isVatsim ? 125 : -1, CLengthUnit::NM());
this->setMaxRange(maxRange);
}
if (newStatus.isDisconnected()) { clear(); } if (newStatus.isDisconnected()) { clear(); }
} }