From: bcoconni Date: Sat, 9 Aug 2014 18:02:44 +0000 (+0200) Subject: Fixed a bug where the rate_limit was ignored if it was set by a property. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=beedd9e683c06c8291cee40cb3da561e00ed6a16;p=flightgear.git Fixed a bug where the rate_limit was ignored if it was set by a property. --- diff --git a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp index e2d07c7d4..ed6ee967f 100644 --- a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp @@ -46,7 +46,7 @@ using namespace std; namespace JSBSim { -IDENT(IdSrc,"$Id: FGActuator.cpp,v 1.35 2014/07/18 22:12:40 bcoconni Exp $"); +IDENT(IdSrc,"$Id: FGActuator.cpp,v 1.36 2014/08/09 17:40:51 bcoconni Exp $"); IDENT(IdHdr,ID_ACTUATOR); /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -109,8 +109,14 @@ FGActuator::FGActuator(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, eleme else rate_limit_decr = rate_limit; } } else { - rate_limit_incr = rate_limit; - rate_limit_decr = rate_limit; + if (rate_limit_prop != 0) { + rate_limit_incr_prop = rate_limit_prop; + rate_limit_decr_prop = rate_limit_prop; + } + else { + rate_limit_incr = rate_limit; + rate_limit_decr = rate_limit; + } } ratelim_el = element->FindNextElement("rate_limit"); }