C++ - ifing the code a bit.

[flightgear.git] / Scenery / scenery.h

diff --git a/Scenery/scenery.h b/Scenery/scenery.h
index 3ff1ab729489ccbfce15e4c176dbaa6713cba37e..2bd1e184f21bf6a8feb949d4fe904a39e21fd09c 100644 (file)
--- a/Scenery/scenery.h
+++ b/Scenery/scenery.h
@@ -28,7 +28,12 @@
 #define _SCENERY_H
 
 
-#include <Include/types.h>
+#include <Include/fg_types.h>
+
+
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
 
 
 /* Define a structure containing global scenery parameters */
@@ -39,6 +44,9 @@ struct fgSCENERY {
     /* center of current scenery chunk */
     struct fgCartesianPoint center;
 
+    /* next center of current scenery chunk */
+    struct fgCartesianPoint next_center;
+
     /* angle of sun relative to current local horizontal */
     double sun_angle;
 };
@@ -47,7 +55,7 @@ extern struct fgSCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
-void fgSceneryInit( void );
+int fgSceneryInit( void );
 
 
 /* Tell the scenery manager where we are so it can load the proper data, and
@@ -59,13 +67,34 @@ void fgSceneryUpdate(double lon, double lat, double elev);
 void fgSceneryRender( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _SCENERY_H */
 
 
 /* $Log$
-/* Revision 1.15  1998/01/22 02:59:41  curt
-/* Changed #ifdef FILE_H to #ifdef _FILE_H
+/* Revision 1.20  1998/04/22 13:22:45  curt
+/* C++ - ifing the code a bit.
 /*
+ * Revision 1.19  1998/04/21 17:02:43  curt
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.18  1998/03/14 00:30:51  curt
+ * Beginning initial terrain texturing experiments.
+ *
+ * Revision 1.17  1998/02/20 00:16:24  curt
+ * Thursday's tweaks.
+ *
+ * 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.