Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Cockpit / cockpit.c

diff --git a/Cockpit/cockpit.c b/Cockpit/cockpit.c
index bc5e6c565ceae4c2aa2446ebb725450fe708f787..5b0eaf54757ba20b7a1acade76a4b3debcbaa286 100644 (file)
--- a/Cockpit/cockpit.c
+++ b/Cockpit/cockpit.c
@@ -27,30 +27,32 @@
 #include <GL/glut.h>
 
 #include <stdlib.h>
-#include "cockpit.h"
+#include <Cockpit/cockpit.h>
 
-#include "../constants.h"
+#include <Include/constants.h>
 
-#include "../Aircraft/aircraft.h"
-#include "../Scenery/mesh.h"
-#include "../Scenery/scenery.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
-#include "../Time/fg_timer.h"
-#include "../Math/fg_random.h"
-#include "../Weather/weather.h"
+#include <Aircraft/aircraft.h>
+#include <Scenery/mesh.h>
+#include <Scenery/scenery.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
+#include <Time/fg_timer.h>
+#include <Math/fg_random.h>
+#include <Weather/weather.h>
 
 // #define DEBUG
 
 /* This is a structure that contains all data related to cockpit/panel/hud system */
-static struct COCKPIT *aircraft_cockpit;
+static struct fgCOCKPIT *aircraft_cockpit;
 
-struct COCKPIT *fgCockpitInit( struct AIRCRAFT cur_aircraft )
+struct fgCOCKPIT *fgCockpitInit( struct fgAIRCRAFT cur_aircraft )
 {
-       struct COCKPIT *cockpit;
+       struct fgCOCKPIT *cockpit;
        Hptr hud;
        
-       cockpit = (struct COCKPIT *)calloc(sizeof(struct COCKPIT),1);
+       printf("Initializing cockpit subsystem\n");
+
+       cockpit = (struct fgCOCKPIT *)calloc(sizeof(struct fgCOCKPIT),1);
        if( cockpit == NULL )
                return( NULL );
                
@@ -66,17 +68,18 @@ struct COCKPIT *fgCockpitInit( struct AIRCRAFT cur_aircraft )
        
        aircraft_cockpit = cockpit;
        
-       printf( "Code %d  Status %d\n", cockpit->hud->code, cockpit->hud->status );
+       printf("  Code %d  Status %d\n", cockpit->hud->code, 
+              cockpit->hud->status );
                
        return( cockpit );
 }
 
-struct COCKPIT *fgCockpitAddHUD( struct COCKPIT *cockpit, struct HUD *hud )
+struct fgCOCKPIT *fgCockpitAddHUD( struct fgCOCKPIT *cockpit, struct HUD *hud )
 {
        cockpit->hud = hud;
 }
 
-void fgCockpitUpdate()
+void fgCockpitUpdate( void )
 {
 
        printf( "Cockpit: code %d   status %d\n", aircraft_cockpit->code, aircraft_cockpit->status );
@@ -87,7 +90,26 @@ void fgCockpitUpdate()
 
 
 /* $Log$
-/* Revision 1.1  1997/08/29 18:03:20  curt
-/* Initial revision.
+/* Revision 1.6  1998/01/19 19:27:01  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.5  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.4  1997/12/30 20:47:34  curt
+ * Integrated new event manager with subsystem initializations.
+ *
+ * Revision 1.3  1997/12/15 23:54:33  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.2  1997/12/10 22:37:38  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.1  1997/08/29 18:03:20  curt
+ * Initial revision.
+ *
  */