X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGModel.cpp;h=71f6cb3ed3d468e5cadb0bd3b7035ff751e161a6;hb=53e8fbfcbb3ddac0dc261043fea7bd24dfa6e62d;hp=fe8039919b2addeea9ac37346ef243f231ba89a2;hpb=4b8fde057be1124c516eb89442eae4bfe4a4db5c;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGModel.cpp b/src/FDM/JSBSim/models/FGModel.cpp index fe8039919..71f6cb3ed 100644 --- a/src/FDM/JSBSim/models/FGModel.cpp +++ b/src/FDM/JSBSim/models/FGModel.cpp @@ -57,7 +57,7 @@ using namespace std; namespace JSBSim { -static const char *IdSrc = "$Id: FGModel.cpp,v 1.15 2010/09/07 00:19:38 jberndt Exp $"; +static const char *IdSrc = "$Id: FGModel.cpp,v 1.16 2010/11/18 12:38:06 jberndt Exp $"; static const char *IdHdr = ID_MODEL; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -72,18 +72,6 @@ FGModel::FGModel(FGFDMExec* fdmex) { FDMExec = fdmex; - Atmosphere = 0; - FCS = 0; - Propulsion = 0; - MassBalance = 0; - Aerodynamics = 0; - Inertial = 0; - GroundReactions = 0; - ExternalReactions = 0; - Aircraft = 0; - Propagate = 0; - Auxiliary = 0; - //in order for FGModel derived classes to self-bind (that is, call //their bind function in the constructor, the PropertyManager pointer //must be brought up now. @@ -106,31 +94,7 @@ FGModel::~FGModel() bool FGModel::InitModel(void) { - Atmosphere = FDMExec->GetAtmosphere(); - FCS = FDMExec->GetFCS(); - Propulsion = FDMExec->GetPropulsion(); - MassBalance = FDMExec->GetMassBalance(); - Aerodynamics = FDMExec->GetAerodynamics(); - Inertial = FDMExec->GetInertial(); - GroundReactions = FDMExec->GetGroundReactions(); - ExternalReactions = FDMExec->GetExternalReactions(); - BuoyantForces = FDMExec->GetBuoyantForces(); - Aircraft = FDMExec->GetAircraft(); - Propagate = FDMExec->GetPropagate(); - Auxiliary = FDMExec->GetAuxiliary(); - - if (!Atmosphere || - !FCS || - !Propulsion || - !MassBalance || - !Aerodynamics || - !Inertial || - !GroundReactions || - !ExternalReactions || - !Aircraft || - !Propagate || - !Auxiliary) return(false); - else return(true); + return true; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%