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

Ref T298, split military flag into check for civilian/military

Browse Source 
* in military -> only military aircraft?
* in civilian -> only civilian aircraft?
This commit is contained in:
Klaus Basan
2018-08-25 19:07:27 +02:00
parent 1b92144f40
commit 3ec3bb8e15
7 changed files with 97 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/aircraftmatcher.cpp
View File

@@ -714,9 +714,17 @@ namespace BlackCore
}
// military / civilian
if (mode.testFlag(CAircraftMatcherSetup::ByMilitary))
bool milFlagReduced = false;
if (mode.testFlag(CAircraftMatcherSetup::ByForceMilitary) && remoteAircraft.isMilitary())
{
matchedModels = ifPossibleReduceByMilitaryFlag(remoteAircraft, matchedModels, reduced, log);
milFlagReduced = true;
}
if (!milFlagReduced && mode.testFlag(CAircraftMatcherSetup::ByForceCivilian) && !remoteAircraft.isMilitary())
{
matchedModels = ifPossibleReduceByMilitaryFlag(remoteAircraft, matchedModels, reduced, log);
milFlagReduced = true;
}
// combined code