Renamed class fgFLIGHT to class FGState as per request by JSB.

[flightgear.git] / Autopilot / autopilot.cxx

diff --git a/Autopilot/autopilot.cxx b/Autopilot/autopilot.cxx
index 7a5382ad8a5bd3c591c9cf938f04ecf7b56988da..defe45f8959969ef996dc7f84c8a340becec8c88 100644 (file)
--- a/Autopilot/autopilot.cxx
+++ b/Autopilot/autopilot.cxx
@@ -50,79 +50,79 @@
 
 static double get_speed( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
 
-       f = current_aircraft.flight;
-       return( FG_V_equiv_kts );    // Make an explicit function call.
+       f = current_aircraft.fdm_state;
+       return( f->get_V_equiv_kts() );    // Make an explicit function call.
 }
 
 static double get_aoa( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
               
-       f = current_aircraft.flight;
-       return( FG_Gamma_vert_rad * RAD_TO_DEG );
+       f = current_aircraft.fdm_state;
+       return( f->get_Gamma_vert_rad() * RAD_TO_DEG );
 }
 
 static double fgAPget_roll( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
 
-       f = current_aircraft.flight;
-       return( FG_Phi * RAD_TO_DEG );
+       f = current_aircraft.fdm_state;
+       return( f->get_Phi() * RAD_TO_DEG );
 }
 
 static double get_pitch( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
               
-       f = current_aircraft.flight;
-       return( FG_Theta );
+       f = current_aircraft.fdm_state;
+       return( f->get_Theta() );
 }
 
 double fgAPget_heading( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
 
-       f = current_aircraft.flight;
-       return( FG_Psi * RAD_TO_DEG );
+       f = current_aircraft.fdm_state;
+       return( f->get_Psi() * RAD_TO_DEG );
 }
 
 static double fgAPget_altitude( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
 
-       f = current_aircraft.flight;
+       f = current_aircraft.fdm_state;
 
-       return( FG_Altitude * FEET_TO_METER /* -rough_elev */ );
+       return( f->get_Altitude() * FEET_TO_METER /* -rough_elev */ );
 }
 
 static double fgAPget_climb( void )
 {
-       fgFLIGHT *f;
+       FGState *f;
 
-       f = current_aircraft.flight;
+       f = current_aircraft.fdm_state;
 
        // return in meters per minute
-       return( FG_Climb_Rate * FEET_TO_METER * 60 );
+       return( f->get_Climb_Rate() * FEET_TO_METER * 60 );
 }
 
 static double get_sideslip( void )
 {
-        fgFLIGHT *f;
+        FGState *f;
         
-        f = current_aircraft.flight;
+        f = current_aircraft.fdm_state;
         
-        return( FG_Beta );
+        return( f->get_Beta() );
 }
 
 static double fgAPget_agl( void )
 {
-        fgFLIGHT *f;
+        FGState *f;
         double agl;
 
-        f = current_aircraft.flight;
-        agl = FG_Altitude * FEET_TO_METER - scenery.cur_elev;
+        f = current_aircraft.fdm_state;
+        agl = f->get_Altitude() * FEET_TO_METER - scenery.cur_elev;
 
         return( agl );
 }