fly/flightgear
1
0
Fork 0
Code Activity

Merge /u/legoboyvdlp/flightgear-src/ branch tcasPatch into next

Browse source 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/162/
This commit is contained in:
James Turner 2019-05-17 09:03:52 +00:00
commit 2266c27930
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Instrumentation/tcas.cxx
View file

@ -1187,27 +1187,27 @@ TCAS::TCAS(SGPropertyNode* pNode) :
name = cval; name = cval;
else if (cname == "number") else if (cname == "number")
num = cintval; num = cintval;
else if (cname == "vertical-range" && cintval > 0) else if (cname == "vertical-range-ft" && cintval > 0)
_verticalRange = cintval; _verticalRange = cintval;
else if (cname == "lateral-range" && cintval > 0) else if (cname == "lateral-range-nm" && cintval > 0)
_lateralRange = cintval; _lateralRange = cintval;
else if (cname == "prox-vertical-range" && cintval > 0) else if (cname == "proximate-vertical-range-ft" && cintval > 0)
_proxVertRange = cintval; _proxVertRange = cintval;
else if (cname == "prox-lateral-range" && cintval > 0) else if (cname == "proximate-lateral-range-nm" && cintval > 0)
_proxLatRange = cintval; _proxLatRange = cintval;
else if (cname == "inc-des-inhb-alt" && cintval > 0) else if (cname == "increase-descent-inhibit-alt-ft" && cintval > 0)
_incDesInhbAlt = cintval; _incDesInhbAlt = cintval;
else if (cname == "des-inhb-alt" && cintval > 0) else if (cname == "descend-inhibit-alt-ft" && cintval > 0)
_DesInhbAlt = cintval; _DesInhbAlt = cintval;
else if (cname == "ra-inhb-alt" && cintval > 0) else if (cname == "ra-inhibit-alt-ft" && cintval > 0)
_RAInhbAlt = cintval; _RAInhbAlt = cintval;
else if (cname == "ta-inhb-alt" && cintval > 0) else if (cname == "ta-inhibit-alt-ft" && cintval > 0)
_TAInhbAlt = cintval; _TAInhbAlt = cintval;
else if (cname == "intruder-inhb-alt" && cintval > 0) else if (cname == "intruder-inhibit-alt-ft" && cintval > 0)
_intruderInhbAlt = cintval; _intruderInhbAlt = cintval;
else if (cname == "intruder-use-self-alt") else if (cname == "intruder-use-own-alt")
_intruderInhbSelfAltToggle = pChild->getBoolValue(); _intruderInhbSelfAltToggle = pChild->getBoolValue();
else if (cname == "intruder-self-alt" && cintval > 0) else if (cname == "intruder-minimum-own-alt-ft" && cintval > 0)
_intruderInhbSelfAlt = cintval; _intruderInhbSelfAlt = cintval;
else else
{ {