Tweaked FDM interface.

[flightgear.git] / Main / fg_init.cxx

diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index b95f8b35b34a8837eadce8c3fab87428abd5f6fd..45f00f274af8d01bf7d3fcd2bfc5dae2392b987a 100644 (file)
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -40,7 +40,6 @@
 #include <string>
 
 #include <Include/fg_constants.h>
-#include <Include/general.h>
 
 #include <Aircraft/aircraft.hxx>
 #include <Airports/simple.hxx>
@@ -49,7 +48,6 @@
 #include <Astro/solarsystem.hxx>
 #include <Autopilot/autopilot.hxx>
 #include <Cockpit/cockpit.hxx>
-// #include <Debug/fg_debug.h>
 #include <Debug/logstream.hxx>
 #include <Joystick/joystick.hxx>
 #include <Math/fg_geodesy.hxx>
@@ -109,7 +107,8 @@ int fgInitPosition( void ) {
            "starting altitude is = " << current_options.get_altitude() );
 
     f->set_Altitude( current_options.get_altitude() * METER_TO_FEET );
-    f->set_Runway_altitude( f->get_Altitude() - 3.758099 );
+    fgFDMSetGroundElevation( current_options.get_flight_model(),
+                            (f->get_Altitude() - 3.758099) * FEET_TO_METER );
 
     FG_LOG( FG_GENERAL, FG_INFO,
            "Initial position is: ("
@@ -124,7 +123,7 @@ int fgInitPosition( void ) {
 // General house keeping initializations
 int fgInitGeneral( void ) {
     string root;
-    int i;
+    // int i;
 
     FG_LOG( FG_GENERAL, FG_INFO, "General Initialization" );
     FG_LOG( FG_GENERAL, FG_INFO, "======= ==============" );
@@ -210,7 +209,8 @@ int fgInitSubsystems( void )
                             tmp_abs_view_pos );
     FG_LOG( FG_GENERAL, FG_DEBUG, 
            "Altitude after update " << scenery.cur_elev );
-    f->set_Runway_altitude( scenery.cur_elev * METER_TO_FEET );
+    fgFDMSetGroundElevation( current_options.get_flight_model(), 
+                            scenery.cur_elev );
 
     // Reset our altitude if we are below ground
     if ( f->get_Altitude() < f->get_Runway_altitude() + 3.758099) {
@@ -343,7 +343,7 @@ int fgInitSubsystems( void )
     // Initialize the flight model subsystem data structures base on
     // above values
 
-    fgFlightModelInit( current_options.get_flight_model(), cur_fdm_state, 
+    fgFDMInit( current_options.get_flight_model(), cur_fdm_state, 
                       1.0 / DEFAULT_MODEL_HZ );
 
     // I'm just sticking this here for now, it should probably move
@@ -381,6 +381,16 @@ int fgInitSubsystems( void )
 
 
 // $Log$
+// Revision 1.62  1999/01/20 13:42:25  curt
+// Tweaked FDM interface.
+// Testing check sum support for NMEA serial output.
+//
+// Revision 1.61  1999/01/08 03:23:57  curt
+// Beginning work on compensating for sim time vs. real world time "jitter".
+//
+// Revision 1.60  1999/01/07 20:25:09  curt
+// Updated struct fgGENERAL to class FGGeneral.
+//
 // Revision 1.59  1998/12/18 23:40:57  curt
 // New frame rate counting mechanism.
 //