[AFV] Ref T739, fix for tuned in/out sounds

see https://discordapp.com/channels/539048679160676382/568904623151382546/636639367804485643
This commit is contained in:
Klaus Basan
2019-10-24 02:34:40 +02:00
parent 94104770bd
commit 5032e7fbd5

View File

@@ -271,8 +271,8 @@ namespace BlackCore
const bool atcCom1 = atcs.hasComUnitTunedInChannelSpacing(com1); const bool atcCom1 = atcs.hasComUnitTunedInChannelSpacing(com1);
const bool atcCom2 = atcs.hasComUnitTunedInChannelSpacing(com2); const bool atcCom2 = atcs.hasComUnitTunedInChannelSpacing(com2);
const bool tunedIn1 = atcCom1 && !lastCom1.isReceiveEnabled(); const bool tunedIn1 = atcCom1 && !lastCom1.isReceiveEnabled();
const bool tunedIn2 = atcCom2 && !lastCom2.isReceiveEnabled(); const bool tunedIn2 = atcCom2 && !lastCom2.isReceiveEnabled();
const bool tunedOut1 = !atcCom1 && lastCom1.isReceiveEnabled(); const bool tunedOut1 = !atcCom1 && lastCom1.isReceiveEnabled();
const bool tunedOut2 = !atcCom2 && lastCom2.isReceiveEnabled(); const bool tunedOut2 = !atcCom2 && lastCom2.isReceiveEnabled();
@@ -289,11 +289,11 @@ namespace BlackCore
} }
// remember if I was tuned in, abusing the flag // remember if I was tuned in, abusing the flag
lastCom1.setReceiveEnabled(tunedIn1); com1.setReceiveEnabled(atcCom1);
lastCom2.setReceiveEnabled(tunedIn2); com2.setReceiveEnabled(atcCom2);
QWriteLocker l(&m_lockAircraft); QWriteLocker l(&m_lockAircraft);
m_lastEvaluatedCom1 = lastCom1; m_lastEvaluatedCom1 = com1;
m_lastEvaluatedCom2 = lastCom2; m_lastEvaluatedCom2 = com1;
} }
bool CContextOwnAircraft::updateOwnSituation(const CAircraftSituation &situation) bool CContextOwnAircraft::updateOwnSituation(const CAircraftSituation &situation)