fly/flightgear
1
0
Fork 0
Code Activity

src/Instrumentation/commradio.cxx: don't use and/or keywords because breaks on windows.

Browse source
This commit is contained in:
Julian Smith 2020-11-01 14:44:38 +00:00
parent 3cbbbe3df4
commit 6c1387e35b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Instrumentation/commradio.cxx
View file

@ -693,14 +693,14 @@ void CommRadioImpl::updateAudio()
bool atis_enabled = _atis_enabled_node->getBoolValue();
int atis_delta = 0;
if (atis_enabled and !_atis_enabled_prev) atis_delta = 1;
if (!atis_enabled and _atis_enabled_prev) atis_delta = -1;
if (atis_enabled && !_atis_enabled_prev) atis_delta = 1;
if (!atis_enabled && _atis_enabled_prev) atis_delta = -1;
if (_atisSpeaker.hasSpokenAtis()) {
// the speaker has created a new atis sample
// remove previous atis sample
_sampleGroup->remove(atisRef);
if (!atis_delta and atis_enabled) atis_delta = 1;
if (!atis_delta && atis_enabled) atis_delta = 1;
}
if (atis_delta == 1) {
// Start play of atis text. We store the most recent sample in _atis_sample