Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss

[flightgear.git] / Cockpit / cockpit.c

diff --git a/Cockpit/cockpit.c b/Cockpit/cockpit.c
index bef2cbf37c76a91d31a33ae84a5661e220d4a61c..8b4b21f76ef9c1084bb29226078b5c4b3479f823 100644 (file)
--- a/Cockpit/cockpit.c
+++ b/Cockpit/cockpit.c
@@ -22,64 +22,72 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
- 
+
 
 #include <GL/glut.h>
 
 #include <stdlib.h>
-#include "cockpit.h"
+#include <Cockpit/cockpit.h>
+
+#include <Include/fg_constants.h>
 
-#include "../constants.h"
+#include <Aircraft/aircraft.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"
+#include <Main/fg_debug.h>
 
-// #define DEBUG
+// This is a structure that contains all data related to
+// cockpit/panel/hud system
 
-/* This is a structure that contains all data related to cockpit/panel/hud system */
-static struct fgCOCKPIT *aircraft_cockpit;
+static fgCOCKPIT *aircraft_cockpit;
 
-struct fgCOCKPIT *fgCockpitInit( struct fgAIRCRAFT cur_aircraft )
+fgCOCKPIT *fgCockpitInit( fgAIRCRAFT *cur_aircraft )
 {
-       struct fgCOCKPIT *cockpit;
+       fgCOCKPIT *cockpit;
        Hptr hud;
-       
-       cockpit = (struct fgCOCKPIT *)calloc(sizeof(struct fgCOCKPIT),1);
+
+       fgPrintf( FG_COCKPIT, FG_INFO, "Initializing cockpit subsystem\n");
+
+       cockpit = (fgCOCKPIT *)calloc(sizeof(fgCOCKPIT),1);
        if( cockpit == NULL )
                return( NULL );
-               
-       cockpit->code = 1234;
+
+       cockpit->code = 1;      /* It will be aircraft dependent */
        cockpit->status = 0;
-       
-       /* If aircraft has HUD */
-       hud = fgHUDInit( cur_aircraft, 3 );
+
+       // If aircraft has HUD
+       hud = fgHUDInit( cur_aircraft );  // Color no longer in parameter list
        if( hud == NULL )
                return( NULL );
-       
+
        cockpit->hud = hud;
-       
+
        aircraft_cockpit = cockpit;
-       
-       printf( "Code %d  Status %d\n", cockpit->hud->code, cockpit->hud->status );
-               
+
+       fgPrintf( FG_COCKPIT, FG_INFO,
+                 "  Code %d  Status %d\n", 
+                 cockpit->hud->code, cockpit->hud->status );
+
        return( cockpit );
 }
 
-struct fgCOCKPIT *fgCockpitAddHUD( struct fgCOCKPIT *cockpit, struct HUD *hud )
+fgCOCKPIT *fgCockpitAddHUD( fgCOCKPIT *cockpit, HUD *hud )
 {
        cockpit->hud = hud;
+       return(cockpit);
 }
 
-void fgCockpitUpdate()
+void fgCockpitUpdate( void )
 {
 
-       printf( "Cockpit: code %d   status %d\n", aircraft_cockpit->code, aircraft_cockpit->status );
+       fgPrintf( FG_COCKPIT, FG_INFO,
+                 "Cockpit: code %d   status %d\n", 
+                 aircraft_cockpit->code, aircraft_cockpit->status );
        if( aircraft_cockpit->hud != NULL )                     // That is, if the aircraft has a HUD,
                fgUpdateHUD( aircraft_cockpit->hud );   // then draw it.
                 
@@ -87,10 +95,42 @@ void fgCockpitUpdate()
 
 
 /* $Log$
-/* 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.10  1998/02/07 15:29:33  curt
+/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+/* <chotchkiss@namg.us.anritsu.com>
 /*
+ * Revision 1.9  1998/02/03 23:20:14  curt
+ * Lots of little tweaks to fix various consistency problems discovered by
+ * Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
+ * passed arguments along to the real printf().  Also incorporated HUD changes
+ * by Michele America.
+ *
+ * Revision 1.8  1998/01/31 00:43:03  curt
+ * Added MetroWorks patches from Carmen Volpe.
+ *
+ * Revision 1.7  1998/01/27 00:47:51  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * 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.
  *