Tons of little changes to clean up the code and to remove fatal errors

[flightgear.git] / Cockpit / hud.c

diff --git a/Cockpit/hud.c b/Cockpit/hud.c
index 1c698753d619f7a69fe647f740db2d628a16d441..0733aed6c27408111bc8dcdfcf2ece39c4c71fcd 100644 (file)
--- a/Cockpit/hud.c
+++ b/Cockpit/hud.c
@@ -31,7 +31,7 @@
 #endif /* not WIN32 */
 #include "hud.h"
 
-#include "../constants.h"
+#include "../Include/constants.h"
 
 #include "../Aircraft/aircraft.h"
 #include "../Scenery/mesh.h"
@@ -386,7 +386,7 @@ static void drawhorizon( struct HUD_horizon horizon )
 {
        int x_inc1, y_inc1;
        int x_inc2, y_inc2;
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
        double sin_bank, cos_bank;
        double bank_angle;
               
@@ -462,49 +462,49 @@ static void drawlabel( struct HUD_label label )
        
 }
 
-double get_speed()
+double get_speed( void )
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
-       return( FG_V_true_kts );
+       return( FG_V_equiv_kts );
 }
 
-double get_aoa()
+double get_aoa( void )
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
        return( FG_Gamma_vert_rad*RAD_TO_DEG );
 }
 
-double get_roll()
+double get_roll( void )
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
        return( FG_Phi );
 }
 
-double get_pitch()
+double get_pitch( void )
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
        return( FG_Theta );
 }
 
-double get_heading()
+double get_heading( void )
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
-       return( FG_Gamma_horiz_rad*RAD_TO_DEG ); 
+       return( FG_Psi*RAD_TO_DEG ); 
 }
 
-double get_altitude()
+double get_altitude( void )
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
        double rough_elev;
               
        f = &current_aircraft.flight;
@@ -522,7 +522,7 @@ void add_instrument( Hptr hud, HIptr instrument )
        // while( ++instruments
 }
 
-Hptr fgHUDInit( struct AIRCRAFT current_aircraft, int color )
+Hptr fgHUDInit( struct fgAIRCRAFT current_aircraft, int color )
 {
        Hptr hud;
        
@@ -570,7 +570,7 @@ Hptr fgHUDAddHorizon( Hptr hud, int x_pos, int y_pos, int length, \
                return( NULL );
        
        instrument->type = ARTIFICIAL_HORIZON;
-       instrument->instr = *horizon;
+       instrument->instr.horizon = *horizon;
        instrument->instr.horizon.x_pos = x_pos;
        instrument->instr.horizon.y_pos = y_pos;
        instrument->instr.horizon.scr_width = length;
@@ -605,7 +605,7 @@ Hptr fgHUDAddScale( Hptr hud, int type, int scr_pos, int scr_min, int scr_max, i
                return( NULL );
        
        instrument->type = SCALE;
-       instrument->instr = *scale;
+       instrument->instr.scale = *scale;
        instrument->instr.scale.type = type;
        instrument->instr.scale.scr_pos = scr_pos;
        instrument->instr.scale.scr_min = scr_min;
@@ -646,7 +646,7 @@ Hptr fgHUDAddLabel( Hptr hud, int x_pos, int y_pos, int size, int blink, int jus
                return( NULL );
        
        instrument->type = LABEL;
-       instrument->instr = *label;
+       instrument->instr.label = *label;
        instrument->instr.label.x_pos = x_pos;
        instrument->instr.label.y_pos = y_pos;
        instrument->instr.label.size = size;
@@ -686,7 +686,7 @@ Hptr fgHUDAddLadder( Hptr hud, int x_pos, int y_pos, int scr_width, int scr_heig
                return( NULL );
 
        instrument->type = LADDER;
-       instrument->instr = *ladder;
+       instrument->instr.ladder = *ladder;
        instrument->instr.ladder.type = 0;      // Not used.
        instrument->instr.ladder.x_pos = x_pos;
        instrument->instr.ladder.y_pos = y_pos;
@@ -799,9 +799,27 @@ void fgUpdateHUD( Hptr hud )
 
 
 /* $Log$
-/* Revision 1.2  1997/09/04 02:17:30  curt
-/* Shufflin' stuff.
+/* Revision 1.7  1998/01/19 18:40:20  curt
+/* Tons of little changes to clean up the code and to remove fatal errors
+/* when building with the c++ compiler.
 /*
+ * Revision 1.6  1997/12/15 23:54:34  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.5  1997/12/10 22:37:39  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.4  1997/09/23 00:29:32  curt
+ * Tweaks to get things to compile with gcc-win32.
+ *
+ * Revision 1.3  1997/09/05 14:17:26  curt
+ * More tweaking with stars.
+ *
+ * Revision 1.2  1997/09/04 02:17:30  curt
+ * Shufflin' stuff.
+ *
  * Revision 1.1  1997/08/29 18:03:22  curt
  * Initial revision.
  *