Removed "depend" files from cvs control. Other minor make tweaks.

[flightgear.git] / Main / fg_init.c

diff --git a/Main/fg_init.c b/Main/fg_init.c
index 12859b569a31392ab09470823496d966787be92b..2957d4b069e89b6981a3e38e7d5da7de9e8ed60d 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -35,6 +35,7 @@
 
 #include <Aircraft/aircraft.h>
 #include <Astro/moon.h>
+#include <Astro/planets.h>
 #include <Astro/sky.h>
 #include <Astro/stars.h>
 #include <Astro/sun.h>
@@ -85,12 +86,11 @@ void fgInitGeneral( void ) {
 void fgInitSubsystems( void ) {
     double cur_elev;
 
-    struct fgFLIGHT *f;
+    fgFLIGHT *f;
     struct fgLIGHT *l;
     struct fgTIME *t;
     struct fgVIEW *v;
 
-    f = &current_aircraft.flight;
     l = &cur_light_params;
     t = &cur_time_params;
     v = &current_view;
@@ -103,6 +103,11 @@ void fgInitSubsystems( void ) {
      * should really be read in from one or more files.
      ****************************************************************/
 
+    /* Must happen before any of the flight model or control
+     * parameters are set */
+    fgAircraftInit();
+    f = current_aircraft.flight;
+
     /* Globe Aiport, AZ */
     FG_Runway_longitude = -398391.28;
     FG_Runway_latitude = 120070.41;
@@ -118,7 +123,7 @@ void fgInitSubsystems( void ) {
     /* Initial Position at (E81) Superior, AZ */
     /* FG_Longitude = ( -111.1270650 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  33.2778339 ) * DEG_TO_RAD; */
-    /* FG_Runway_altitude = (2646 + 500); */
+    /* FG_Runway_altitude = (2646 + 1000); */
     /* FG_Altitude = FG_Runway_altitude + 3.758099; */
 
     /* Initial Position at (TUS) Tucson, AZ */
@@ -152,7 +157,7 @@ void fgInitSubsystems( void ) {
     /* FG_Altitude = FG_Runway_altitude + 3.758099; */
     
     /* Initial Position north of the city of Globe */
-    /* FGto do the install_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
+    /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  120625.64 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Longitude = ( -397867.44 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  119548.21 / 3600.0 ) * DEG_TO_RAD; */
@@ -169,6 +174,18 @@ void fgInitSubsystems( void ) {
     /* FG_Latitude  = (  45.15 ) * DEG_TO_RAD; */
     /* FG_Altitude = FG_Runway_altitude + 3.758099; */
 
+    /* Initial Position: Somewhere near the Grand Canyon */
+    /* FG_Longitude = ( -112.5 ) * DEG_TO_RAD; */
+    /* FG_Latitude  = (  36.5 ) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 5000.0; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+
+    /* Initial Position: (GCN) Grand Canyon Airport, AZ */
+    /* FG_Longitude = ( -112.1469647 ) * DEG_TO_RAD; */
+    /* FG_Latitude  = (   35.9523539 ) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 6606.0; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+
     /* A random test position */
     /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
@@ -244,7 +261,7 @@ void fgInitSubsystems( void ) {
                     FG_EVENT_READY, 120000 );
 
     /* Initialize the Cockpit subsystem */
-    if( fgCockpitInit( current_aircraft ) == NULL ) {
+    if( fgCockpitInit( &current_aircraft ) == NULL ) {
        fgPrintf( FG_GENERAL, FG_EXIT, "Error in Cockpit initialization!\n" );
     }
 
@@ -254,8 +271,11 @@ void fgInitSubsystems( void ) {
     /* Initialize the Stars subsystem */
     fgStarsInit();
 
+    /* Initialize the planetary subsystem */
+    fgEventRegister("fgPlanetsInit()", fgPlanetsInit, FG_EVENT_READY, 600000);
+
     /* Initialize the sun's position */
-    fgEventRegister( "fgSunInit()", fgSunInit, FG_EVENT_READY, 600000 );
+    fgEventRegister( "fgSunInit()", fgSunInit, FG_EVENT_READY, 60000 );
 
     /* Intialize the moon's position */
     fgEventRegister( "fgMoonInit()", fgMoonInit, FG_EVENT_READY, 600000 );
@@ -314,9 +334,28 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.37  1998/02/01 03:39:54  curt
-/* Minor tweaks.
+/* Revision 1.42  1998/02/09 22:56:58  curt
+/* Removed "depend" files from cvs control.  Other minor make tweaks.
 /*
+ * Revision 1.41  1998/02/09 15:07:50  curt
+ * Minor tweaks.
+ *
+ * Revision 1.40  1998/02/07 15:29:44  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.39  1998/02/03 23:20:25  curt
+ * Lots of little tweaks to fix various consistency problems discovered by
+ * Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
+ * passed arguments along to the real printf().  Also incorporated HUD changes
+ * by Michele America.
+ *
+ * Revision 1.38  1998/02/02 20:53:58  curt
+ * Incorporated Durk's changes.
+ *
+ * Revision 1.37  1998/02/01 03:39:54  curt
+ * Minor tweaks.
+ *
  * Revision 1.36  1998/01/31 00:43:13  curt
  * Added MetroWorks patches from Carmen Volpe.
  *