Root path info moved to fgOPTIONS.

diff --git a/Astro/orbits.cxx b/Astro/orbits.cxx
index df8f94d06458820bfdda03db907de4f21f6e2191..bf30e94a7ebf9b0c09d3c11a895320d6fbf1b727 100644 (file)
--- a/Astro/orbits.cxx
+++ b/Astro/orbits.cxx
@@ -32,7 +32,7 @@
 
 #include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
-#include <Include/general.h>
+#include <Main/options.hxx>
 #include <Time/fg_time.hxx>
 
 #include "orbits.hxx"
@@ -113,7 +113,7 @@ int fgReadOrbElements(struct OrbElements *dest, FILE *src)
 
 int fgSolarSystemInit(fgTIME t)
 {
-    fgGENERAL *g;
+    fgOPTIONS *o;
     char path[80];
     int i;
     FILE *data;
@@ -121,10 +121,10 @@ int fgSolarSystemInit(fgTIME t)
 
     fgPrintf( FG_ASTRO, FG_INFO, "Initializing solar system\n");
 
-   /* build the full path name to the orbital elements database file */
-    g = &general;
+    /* build the full path name to the orbital elements database file */
+    o = &current_options;
     path[0] = '\0';
-    strcat(path, g->root_dir);
+    strcat(path, o->fg_root);
     strcat(path, "/Scenery/");
     strcat(path, "Planets.dat");
 
@@ -170,9 +170,12 @@ void fgSolarSystemUpdate(struct OrbElements *planet, fgTIME t)
 
 
 /* $Log$
-/* Revision 1.4  1998/04/28 01:19:00  curt
-/* Type-ified fgTIME and fgVIEW
+/* Revision 1.5  1998/05/13 18:25:34  curt
+/* Root path info moved to fgOPTIONS.
 /*
+ * Revision 1.4  1998/04/28 01:19:00  curt
+ * Type-ified fgTIME and fgVIEW
+ *
  * Revision 1.3  1998/04/25 22:06:25  curt
  * Edited cvs log messages in source files ... bad bad bad!
  *

diff --git a/Astro/stars.cxx b/Astro/stars.cxx
index a7ba50f3e7a084dd2e5d280507666345be7a4fef..e587e5bd8e34e75c6a5543724fddcf8e9667995b 100644 (file)
--- a/Astro/stars.cxx
+++ b/Astro/stars.cxx
@@ -43,7 +43,7 @@
 #include <Aircraft/aircraft.h>
 #include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
-#include <Include/general.h>
+#include <Main/options.hxx>
 #include <Main/views.hxx>
 #include <Time/fg_time.hxx>
 
@@ -63,7 +63,7 @@
 /* Initialize the Star Management Subsystem */
 int fgStarsInit( void ) {
     FILE *fd;
-    fgGENERAL *g;
+    fgOPTIONS *o;
     /* struct CelestialCoord pltPos; */
     char path[1024];
     char line[256], name[256];
@@ -75,11 +75,11 @@ int fgStarsInit( void ) {
 
     fgPrintf( FG_ASTRO, FG_INFO, "Initializing stars\n");
 
-    g = &general;
+    o = &current_options;
 
     /* build the full path name to the stars data base file */
     path[0] = '\0';
-    strcat(path, g->root_dir);
+    strcat(path, o->fg_root);
     strcat(path, "/Scenery/");
     strcat(path, "Stars.dat");
 
@@ -260,9 +260,12 @@ void fgStarsRender( void ) {
 
 
 /* $Log$
-/* Revision 1.5  1998/04/28 01:19:03  curt
-/* Type-ified fgTIME and fgVIEW
+/* Revision 1.6  1998/05/13 18:25:35  curt
+/* Root path info moved to fgOPTIONS.
 /*
+ * Revision 1.5  1998/04/28 01:19:03  curt
+ * Type-ified fgTIME and fgVIEW
+ *
  * Revision 1.4  1998/04/26 05:10:02  curt
  * "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd.
  *