Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message

[flightgear.git] / Scenery / scenery.h

diff --git a/Scenery/scenery.h b/Scenery/scenery.h
index 635826f2994c58d3bdbeb9141b535a78cca33db0..8ea40ae5d0227a9be8f872cd0d19659d7bfdeddf 100644 (file)
--- a/Scenery/scenery.h
+++ b/Scenery/scenery.h
@@ -24,15 +24,15 @@
  **************************************************************************/
 
 
-#ifndef SCENERY_H
-#define SCENERY_H
+#ifndef _SCENERY_H
+#define _SCENERY_H
 
 
-#include "../types.h"
+#include <Include/fg_types.h>
 
 
 /* Define a structure containing global scenery parameters */
-struct SCENERY {
+struct fgSCENERY {
     /* number of terrain data points to skip */
     int terrain_skip;
 
@@ -43,11 +43,11 @@ struct SCENERY {
     double sun_angle;
 };
 
-extern struct SCENERY scenery;
+extern struct fgSCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
-void fgSceneryInit();
+void fgSceneryInit( void );
 
 
 /* Tell the scenery manager where we are so it can load the proper data, and
@@ -56,16 +56,39 @@ void fgSceneryUpdate(double lon, double lat, double elev);
 
 
 /* Render out the current scene */
-void fgSceneryRender();
+void fgSceneryRender( void );
 
 
-#endif /* SCENERY_H */
+#endif /* _SCENERY_H */
 
 
 /* $Log$
-/* Revision 1.10  1997/09/04 02:17:37  curt
-/* Shufflin' stuff.
+/* Revision 1.16  1998/01/27 00:48:03  curt
+/* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+/* system and commandline/config file processing code.
 /*
+ * Revision 1.15  1998/01/22 02:59:41  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.14  1998/01/19 19:27:17  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.13  1998/01/19 18:40:38  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.12  1997/12/15 23:55:03  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.11  1997/12/10 22:37:52  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.10  1997/09/04 02:17:37  curt
+ * Shufflin' stuff.
+ *
  * Revision 1.9  1997/08/27 03:30:33  curt
  * Changed naming scheme of basic shared structures.
  *