Prepended "fg" on the name of all global structures that didn't have it yet.

[flightgear.git] / Cockpit / hud.c

diff --git a/Cockpit/hud.c b/Cockpit/hud.c
index 1c698753d619f7a69fe647f740db2d628a16d441..37bf6d4a0ee712581edea880aee63b1bc1507c16 100644 (file)
--- a/Cockpit/hud.c
+++ b/Cockpit/hud.c
@@ -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;
               
@@ -464,15 +464,15 @@ static void drawlabel( struct HUD_label label )
 
 double get_speed()
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
-       return( FG_V_true_kts );
+       return( FG_V_equiv_kts );
 }
 
 double get_aoa()
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
        return( FG_Gamma_vert_rad*RAD_TO_DEG );
@@ -480,7 +480,7 @@ double get_aoa()
 
 double get_roll()
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
        return( FG_Phi );
@@ -488,7 +488,7 @@ double get_roll()
 
 double get_pitch()
 {
-       struct FLIGHT *f;
+       struct fgFLIGHT *f;
               
        f = &current_aircraft.flight;
        return( FG_Theta );
@@ -496,15 +496,15 @@ double get_pitch()
 
 double get_heading()
 {
-       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()
 {
-       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;
        
@@ -551,6 +551,7 @@ Hptr fgHUDInit( struct AIRCRAFT current_aircraft, int color )
 Hptr fgHUDAddHorizon( Hptr hud, int x_pos, int y_pos, int length, \
                                                int hole_len, double (*load_value)() )
 {
+#ifndef WIN32
        struct HUD_horizon *horizon;
        struct HUD_instr *instrument;
        HIptr tmp_first, tmp_next;
@@ -581,11 +582,13 @@ Hptr fgHUDAddHorizon( Hptr hud, int x_pos, int y_pos, int length, \
        hud->instruments = instrument;
 
        return( hud );
+#endif
 }
 
 Hptr fgHUDAddScale( Hptr hud, int type, int scr_pos, int scr_min, int scr_max, int div_min, int div_max, \
                                        int orientation, int with_min, int min_value, int width_units, double (*load_value)() )
 {
+#ifndef WIN32
        struct HUD_scale *scale;
        struct HUD_instr *instrument;
        HIptr tmp_first, tmp_next;
@@ -622,11 +625,13 @@ Hptr fgHUDAddScale( Hptr hud, int type, int scr_pos, int scr_min, int scr_max, i
        hud->instruments = instrument;
 
        return( hud );
+#endif
 }
 
 Hptr fgHUDAddLabel( Hptr hud, int x_pos, int y_pos, int size, int blink, int justify, \
                                        char *pre_str, char *post_str, char *format, double (*load_value)() )
 {
+#ifndef WIN32
        struct HUD_label *label;
        struct HUD_instr *instrument;
        HIptr tmp_first, tmp_next;
@@ -661,12 +666,14 @@ Hptr fgHUDAddLabel( Hptr hud, int x_pos, int y_pos, int size, int blink, int jus
        hud->instruments = instrument;
 
        return( hud );
+#endif
 }
 
 Hptr fgHUDAddLadder( Hptr hud, int x_pos, int y_pos, int scr_width, int scr_height, \
                                        int hole_len, int div_units, int label_pos, int width_units, \
                                        double (*load_roll)(), double (*load_pitch)() )
 {
+#ifndef WIN32
        struct HUD_ladder *ladder;
        struct HUD_instr *instrument;
        HIptr tmp_first, tmp_next;
@@ -703,6 +710,7 @@ Hptr fgHUDAddLadder( Hptr hud, int x_pos, int y_pos, int scr_width, int scr_heig
        hud->instruments = instrument;
 
        return( hud );
+#endif
 }
 
 /*
@@ -799,9 +807,19 @@ void fgUpdateHUD( Hptr hud )
 
 
 /* $Log$
-/* Revision 1.2  1997/09/04 02:17:30  curt
-/* Shufflin' stuff.
+/* 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.
  *