Use new C++ events class.

[simgear.git] / Astro / stars.cxx

diff --git a/Astro/stars.cxx b/Astro/stars.cxx
index 3f2c953961186c0d3f64a133c8ae25fc42454c15..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");
 
@@ -223,9 +223,9 @@ int fgStarsInit( void ) {
 /* Draw the Stars */
 void fgStarsRender( void ) {
     fgFLIGHT *f;
-    struct fgVIEW *v;
-    struct fgLIGHT *l;
-    struct fgTIME *t;
+    fgVIEW *v;
+    fgLIGHT *l;
+    fgTIME *t;
     int i;
 
     f = current_aircraft.flight;
@@ -260,9 +260,18 @@ void fgStarsRender( void ) {
 
 
 /* $Log$
-/* Revision 1.3  1998/04/25 22:06:26  curt
-/* Edited cvs log messages in source files ... bad bad bad!
+/* 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.
+ *
+ * Revision 1.3  1998/04/25 22:06:26  curt
+ * Edited cvs log messages in source files ... bad bad bad!
+ *
  * Revision 1.2  1998/04/24 00:45:03  curt
  * Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
  * Fixed a bug when generating sky colors.