Integrated new event manager with subsystem initializations.

[flightgear.git] / Scenery / orbits.c

diff --git a/Scenery/orbits.c b/Scenery/orbits.c
index c261856133441f9a24be54ff0edbe0d0d0614c0c..99ddd63532d3c69e6a34a7459200f6d93b2d81bc 100644 (file)
--- a/Scenery/orbits.c
+++ b/Scenery/orbits.c
@@ -27,7 +27,7 @@
 
 #include "orbits.h"
 
-#include "../general.h"
+#include "../Include/general.h"
 #include "../Time/fg_time.h"
 
 
@@ -53,10 +53,11 @@ double fgCalcActTime(struct fgTIME t)
     actTime += (UT / 24.0);
     #define DEBUG 1
     #ifdef DEBUG
-    printf("Actual Time:\n");
-    printf("current day = %f\t", actTime);
-    printf("GMT = %d, %d, %d, %d, %d, %d\n",           year, t.gmt->tm_mon, t.gmt->tm_mday,
-                                             t.gmt->tm_hour, t.gmt->tm_min, t.gmt->tm_sec);
+    /* printf("  Actual Time:\n"); */
+    /* printf("  current day = %f\t", actTime); */
+    /* printf("  GMT = %d, %d, %d, %d, %d, %d\n",
+          year, t.gmt->tm_mon, t.gmt->tm_mday,
+          t.gmt->tm_hour, t.gmt->tm_min, t.gmt->tm_sec); */
     #endif
     return actTime;
 }
@@ -119,17 +120,19 @@ void fgReadOrbElements(struct OrbElements *dest, FILE *src)
 
 void fgSolarSystemInit(struct fgTIME t)
 {
-   struct GENERAL *g;
+   struct fgGENERAL *g;
    char path[80];
    int i;
    FILE *data;
 
+   printf("Initializing solar system\n");
+
    /* build the full path name to the orbital elements database file */
    g = &general;
    path[0] = '\0';
    strcat(path, g->root_dir);
    strcat(path, "/Scenery/");
-   strcat(path, "planets.dat");
+   strcat(path, "Planets.dat");
 
    if ( (data = fopen(path, "r")) == NULL )
    {
@@ -137,7 +140,7 @@ void fgSolarSystemInit(struct fgTIME t)
            return;
    }
    #ifdef DEBUG
-   printf("reading datafile %s", path);
+   printf("  reading datafile %s\n", path);
    #endif
 
    /* for all the objects... */
@@ -170,9 +173,23 @@ void fgSolarSystemUpdate(struct OrbElements *planet, struct fgTIME t)
 
 
 /* $Log$
-/* Revision 1.2  1997/11/25 19:25:36  curt
-/* Changes to integrate Durk's moon/sun code updates + clean up.
+/* Revision 1.6  1997/12/30 20:47:52  curt
+/* Integrated new event manager with subsystem initializations.
 /*
+ * Revision 1.5  1997/12/15 23:55:02  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.4  1997/12/10 22:37:51  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
+ * Revision 1.3  1997/11/25 23:20:44  curt
+ * Changed planets.dat Planets.dat
+ *
+ * Revision 1.2  1997/11/25 19:25:36  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
  * Revision 1.1  1997/10/25 03:16:10  curt
  * Initial revision of code contributed by Durk Talsma.
  *