Tons of little changes to clean up the code and to remove fatal errors

when building with the c++ compiler.

diff --git a/Astro/depend b/Astro/depend
index f73a25397f5ed005ecaaeab3ba53286f072b676c..223726e34dd1729dadc74b6eac79da513cbf38ab 100644 (file)
--- a/Astro/depend
+++ b/Astro/depend
@@ -8,6 +8,17 @@ moon.o: moon.c ../XGL/xgl.h orbits.h ../Time/fg_time.h \
  ../Include/general.h ../Main/views.h ../Main/../Include/types.h \
  ../Main/../Flight/flight.h ../Main/../Math/mat3.h \
  ../Main/../Time/fg_time.h
+old_astro.o: old_astro.c ../XGL/xgl.h old_astro.h stars.h moon.h \
+ orbits.h ../Time/fg_time.h ../Time/../Include/types.h \
+ ../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \
+ ../Time/../Flight/LaRCsim/ls_interface.h \
+ ../Time/../Flight/LaRCsim/../flight.h planets.h sun.h \
+ ../Include/constants.h ../Include/general.h ../Main/views.h \
+ ../Main/../Include/types.h ../Main/../Flight/flight.h \
+ ../Main/../Math/mat3.h ../Main/../Time/fg_time.h \
+ ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
+ ../Aircraft/../Controls/controls.h \
+ ../Aircraft/../Controls/../Include/limits.h
 orbits.o: orbits.c orbits.h ../Time/fg_time.h \
  ../Time/../Include/types.h ../Time/../Flight/flight.h \
  ../Time/../Flight/Slew/slew.h \

diff --git a/Astro/moon.c b/Astro/moon.c
index aa99c92dd9cbd0c79594039a46d61228f2055aee..227743e9302e78fefa371525fde7c3d37f8b549a 100644 (file)
--- a/Astro/moon.c
+++ b/Astro/moon.c
@@ -257,7 +257,7 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params,
 }
 
 
-void fgMoonInit() {
+void fgMoonInit( void ) {
     struct fgLIGHT *l;
     static int dl_exists = 0;
 
@@ -298,7 +298,7 @@ void fgMoonInit() {
 
 
 /* Draw the moon */
-void fgMoonRender() {
+void fgMoonRender( void ) {
     struct fgLIGHT *l;
     GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
 
@@ -320,9 +320,13 @@ void fgMoonRender() {
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:16  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:16  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:16  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.16  1998/01/06 01:20:24  curt
  * Tweaks to help building with MSVC++
  *

diff --git a/Astro/moon.h b/Astro/moon.h
index c4d21ed20159927da39edb1d2c5c5e0763472742..90a94f98e7d0d7b59295159ddb69cacdc3819c17 100644 (file)
--- a/Astro/moon.h
+++ b/Astro/moon.h
@@ -36,10 +36,10 @@
 
 
  /* Initialize the Moon Display management Subsystem */
-void fgMoonInit();
+void fgMoonInit( void );
 
 /* Draw the Stars */
-void fgMoonRender();
+void fgMoonRender( void );
 
 struct CelestialCoord fgCalculateMoon(struct OrbElements Params,
                                       struct OrbElements sunParams,
@@ -51,9 +51,13 @@ extern struct OrbElements pltOrbElements[9];
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:16  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:17  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:16  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.4  1997/12/11 04:43:56  curt
  * Fixed sun vector and lighting problems.  I thing the moon is now lit
  * correctly.

diff --git a/Astro/sky.c b/Astro/sky.c
index 4de37c7369d10e2fbf7beaf02ed1b824c363d00c..a7a7b098c6d38a66eaf9c344513363e069b2fab0 100644 (file)
--- a/Astro/sky.c
+++ b/Astro/sky.c
@@ -72,7 +72,7 @@ static float outer_color[12][4];
 
 
 /* Calculate the sky structure vertices */
-void fgSkyVerticesInit() {
+void fgSkyVerticesInit( void ) {
     float theta;
     int i;
 
@@ -101,7 +101,7 @@ void fgSkyVerticesInit() {
 
 
 /* (Re)calculate the sky colors at each vertex */
-void fgSkyColorsInit() {
+void fgSkyColorsInit( void ) {
     struct fgLIGHT *l;
     float sun_angle, diff;
     float outer_param[3], outer_amt[3], outer_diff[3];
@@ -224,7 +224,7 @@ void fgSkyColorsInit() {
 
 
 /* Initialize the sky structure and colors */
-void fgSkyInit() {
+void fgSkyInit( void ) {
     printf("Initializing the sky\n");
 
     fgSkyVerticesInit();
@@ -236,7 +236,7 @@ void fgSkyInit() {
 
 
 /* Draw the Sky */
-void fgSkyRender() {
+void fgSkyRender( void ) {
     struct fgFLIGHT *f;
     struct fgLIGHT *l;
     struct fgVIEW *v;
@@ -329,9 +329,13 @@ void fgSkyRender() {
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:19  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:17  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:19  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.11  1997/12/30 22:22:38  curt
  * Further integration of event manager.
  *

diff --git a/Astro/sky.h b/Astro/sky.h
index 7ba4863e3d914a6eed7da68bcb5f9cbab1d0736b..0479a4b96c186ca87c1da9d20c08fd308ce573af 100644 (file)
--- a/Astro/sky.h
+++ b/Astro/sky.h
@@ -25,19 +25,23 @@
 
 
 /* (Re)generate the display list */
-void fgSkyInit();
+void fgSkyInit( void );
 
 /* (Re)calculate the sky colors at each vertex */
-void fgSkyColorsInit();
+void fgSkyColorsInit( void );
 
 /* Draw the Sky */
-void fgSkyRender();
+void fgSkyRender( void );
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:19  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:17  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:19  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.2  1997/12/22 23:45:49  curt
  * First stab at sunset/sunrise sky glow effects.
  *

diff --git a/Astro/stars.c b/Astro/stars.c
index 6d3d4a53e94e15b0f73170a97997fc60b91b11f4..711a9a06bffd88e8ec658d5b04c44a0d6444e212 100644 (file)
--- a/Astro/stars.c
+++ b/Astro/stars.c
@@ -56,7 +56,7 @@
 
 
 /* Initialize the Star Management Subsystem */
-void fgStarsInit() {
+void fgStarsInit( void ) {
     FILE *fd;
     struct fgGENERAL *g;
     struct CelestialCoord pltPos;
@@ -237,7 +237,7 @@ void fgStarsInit() {
 
 
 /* Draw the Stars */
-void fgStarsRender() {
+void fgStarsRender( void ) {
     struct fgFLIGHT *f;
     struct fgVIEW *v;
     struct fgLIGHT *l;
@@ -276,9 +276,13 @@ void fgStarsRender() {
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:20  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:18  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:20  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.24  1997/12/30 22:22:39  curt
  * Further integration of event manager.
  *

diff --git a/Astro/stars.h b/Astro/stars.h
index 19524e12084b3aa9af4ec9ad68a147b8ddfbbda4..b08ffda9502d86cb44cc27a53d9c514dc8c672bf 100644 (file)
--- a/Astro/stars.h
+++ b/Astro/stars.h
@@ -33,10 +33,10 @@
 #define FG_MIN_STAR_MAG 0.738750 /* magnitude of weakest star we'll display */
 
 /* Initialize the Star Management Subsystem */
-void fgStarsInit();
+void fgStarsInit( void );
 
 /* Draw the Stars */
-void fgStarsRender();
+void fgStarsRender( void );
 extern struct OrbElements pltOrbElements[9];
 extern struct fgTIME cur_time_params;
 
@@ -44,9 +44,13 @@ extern struct fgTIME cur_time_params;
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:20  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:18  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:20  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.6  1997/10/25 03:18:29  curt
  * Incorporated sun, moon, and planet position and rendering code contributed
  * by Durk Talsma.

diff --git a/Astro/sun.c b/Astro/sun.c
index 43e2c353e100355aa803ffa946bda23aac185559..2c89ae3c1c58d22d10ec50bf6c8f9ed1078cc43c 100644 (file)
--- a/Astro/sun.c
+++ b/Astro/sun.c
@@ -94,7 +94,7 @@ struct CelestialCoord fgCalculateSun(struct OrbElements params, struct fgTIME t)
 
 
 /* Initialize the Sun */
-void fgSunInit() {
+void fgSunInit( void ) {
     static int dl_exists = 0;
 
     printf("  Initializing the Sun\n");
@@ -126,7 +126,7 @@ void fgSunInit() {
 
 
 /* Draw the Sun */
-void fgSunRender() {
+void fgSunRender( void ) {
     struct fgVIEW *v;
     struct fgTIME *t;
     struct fgLIGHT *l;
@@ -190,9 +190,13 @@ void fgSunRender() {
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:20  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:18  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:20  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.12  1998/01/05 18:44:36  curt
  * Add an option to advance/decrease time from keyboard.
  *

diff --git a/Astro/sun.h b/Astro/sun.h
index 260101f76b9d4a438628766d23ac843091a9dbdd..9683462cc0bd7c8cd9c742cbfd332125a2fbcd29 100644 (file)
--- a/Astro/sun.h
+++ b/Astro/sun.h
@@ -31,19 +31,23 @@ struct SunPos fgCalcSunPos(struct OrbElements sunParams);
 extern struct OrbElements pltOrbElements[9];
 
 /* Initialize the Sun */
-void fgSunInit();
+void fgSunInit( void );
 
 /* Draw the Sun */
-void fgSunRender();
+void fgSunRender( void );
 
 
 #endif /* SUN_H */
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:21  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/19 18:40:19  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.1  1998/01/07 03:16:21  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.3  1997/12/11 04:43:56  curt
  * Fixed sun vector and lighting problems.  I thing the moon is now lit
  * correctly.