Prepended "fg" on the name of all global structures that didn't have it yet.

[flightgear.git] / Scenery / scenery.c

diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index 86a3faf175a9104b170ef705050ee2be71cb819a..7c27c8d5408d675fca16f7d83339411dd458ddf5 100644 (file)
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -34,7 +34,7 @@
 
 #include "../general.h"
 
-#include "moon.h"
+#include "astro.h"
 #include "obj.h"
 #include "scenery.h"
 #include "stars.h"
@@ -45,7 +45,7 @@ GLint area_terrain;
 
 
 /* Shared structure to hold current scenery parameters */
-struct SCENERY scenery;
+struct fgSCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
@@ -58,7 +58,7 @@ void fgSceneryInit() {
 /* Tell the scenery manager where we are so it can load the proper data, and
  * build the proper structures. */
 void fgSceneryUpdate(double lon, double lat, double elev) {
-    struct GENERAL *g;
+    struct fgGENERAL *g;
     char path[1024];
 
     g = &general;
@@ -80,19 +80,28 @@ void fgSceneryUpdate(double lon, double lat, double elev) {
 
 /* Render out the current scene */
 void fgSceneryRender() {
-    glPushMatrix();
     glCallList(area_terrain);
-    glPopMatrix();
-    fgStarsRender();
 
-    fgMoonRender();
+    fgAstroRender();
 }
 
 
 /* $Log$
-/* Revision 1.22  1997/10/28 21:00:22  curt
-/* Changing to new terrain format.
+/* Revision 1.25  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.24  1997/12/08 22:51:18  curt
+ * Enhanced to handle ccw and cw tri-stripe winding.  This is a temporary
+ * admission of defeat.  I will eventually go back and get all the stripes
+ * wound the same way (ccw).
+ *
+ * Revision 1.23  1997/11/25 19:25:37  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
+ * Revision 1.22  1997/10/28 21:00:22  curt
+ * Changing to new terrain format.
+ *
  * Revision 1.21  1997/10/25 03:24:24  curt
  * Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
  *