fly/flightgear
1
0
Fork 0
Code Activity

UIUC cleanup of -Wparentheses compilation warnings.

Browse source
This commit is contained in:
Edward d'Auvergne 2015-12-10 08:25:17 +01:00
parent 5bf59d58c4
commit ce7c6de726
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/FDM/UIUCModel/uiuc_aerodeflections.cpp
View file

@ -189,12 +189,13 @@ void uiuc_aerodeflections( double dt )
else else
aileron += aileron_sas; aileron += aileron_sas;
// don't exceed aileron deflection limits // don't exceed aileron deflection limits
if (fabs(aileron) > (damax * DEG_TO_RAD)) if (fabs(aileron) > (damax * DEG_TO_RAD)) {
if (aileron > 0) if (aileron > 0)
aileron = damax * DEG_TO_RAD; aileron = damax * DEG_TO_RAD;
else else
aileron = -damax * DEG_TO_RAD; aileron = -damax * DEG_TO_RAD;
} }
}
// SAS for yaw, positive rudder deflection is TEL // SAS for yaw, positive rudder deflection is TEL
if (use_rudder_stick_gain) if (use_rudder_stick_gain)
@ -213,12 +214,13 @@ void uiuc_aerodeflections( double dt )
rudder += rudder_sas; rudder += rudder_sas;
// don't exceed rudder deflection limits, assumes drmax = drmin, // don't exceed rudder deflection limits, assumes drmax = drmin,
// i.e. equal rudder throws left and right // i.e. equal rudder throws left and right
if (fabs(rudder) > drmax) if (fabs(rudder) > drmax) {
if (rudder > 0) if (rudder > 0)
rudder = drmax * DEG_TO_RAD; rudder = drmax * DEG_TO_RAD;
else else
rudder = -drmax * DEG_TO_RAD; rudder = -drmax * DEG_TO_RAD;
} }
}
/* This old code in the first part of the if-block needs to get removed from FGFS. 030222 MSS /* This old code in the first part of the if-block needs to get removed from FGFS. 030222 MSS
The second part of the if-block is rewritten below. The second part of the if-block is rewritten below.