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

Style

Browse Source
This commit is contained in:
Klaus Basan
2018-10-06 13:18:56 +02:00
parent 56f2b48c47
commit 1280359fe1
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/airspacemonitor.cpp
View File

@@ -369,7 +369,7 @@ namespace BlackCore
if (callsign.hasSuffix())
{
// very likely and ATC callsign
const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({CAtcStation::IndexController, CUser::IndexRealName}, realname);
const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CAtcStation::IndexController, CUser::IndexRealName }, realname);
const int c1 = this->updateOnlineStation(callsign, vm, false, true);
const int c2 = this->updateBookedStation(callsign, vm, false, true);
wasAtc = c1 > 0 || c2 > 0;
@@ -382,8 +382,9 @@ namespace BlackCore
}
// Client
if (!sApp || !sApp->getWebDataServices()) { return; }
const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign);
CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({CClient::IndexUser, CUser::IndexRealName}, realname);
CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CClient::IndexUser, CUser::IndexRealName }, realname);
vm.addValue({ CClient::IndexVoiceCapabilities }, voiceCaps);
this->updateOrAddClient(callsign, vm, false);
}
@@ -548,7 +549,7 @@ namespace BlackCore
station.setFrequency(frequency);
station.setPosition(position);
station.setOnline(true);
station.calculcateAndUpdateRelativeDistanceAndBearing(getOwnAircraftPosition());
station.calculcateAndUpdateRelativeDistanceAndBearing(this->getOwnAircraftPosition());
// sync with bookings
if (m_atcStationsBooked.containsCallsign(callsign))
@@ -1151,7 +1152,7 @@ namespace BlackCore
CLength CAirspaceMonitor::calculateDistanceToOwnAircraft(const CAircraftSituation &situation) const
{
CLength distance = getOwnAircraft().calculateGreatCircleDistance(situation);
CLength distance = this->getOwnAircraft().calculateGreatCircleDistance(situation);
distance.switchUnit(CLengthUnit::NM());
return distance;
}