Added Mach Number to hud.

[flightgear.git] / src / Cockpit / hud.hxx

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index e262456424cce507ddbf7f7058b478cca6d0ed80..c64a83f14c9f8c315963134ca965b603593c8076 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -57,6 +57,8 @@
 
 FG_USING_STD(deque);
 FG_USING_STD(vector);
+FG_USING_NAMESPACE(std);
+
 
 #ifndef WIN32
   typedef struct {
@@ -178,6 +180,7 @@ extern float get_vfc_ratio   ( void );
 extern float get_vfc_tris_drawn   ( void );
 extern float get_vfc_tris_culled   ( void );
 extern float get_climb_rate  ( void );
+extern float get_mach( void );
 extern char *coord_format_lat(float);
 extern char *coord_format_lon(float);
 //extern char *coord_format_latlon(float latitude, float longitude);  // cockpit.cxx
@@ -233,14 +236,11 @@ extern float HUD_matrix[16];
 
 class fgText {
 private:
-    char msg[32];
     float x, y;
+    char msg[64];
 public:
-    fgText( char *c = NULL, float x = 0, float y =0 )
-        : x(x), y(y) {strncpy(msg,c,32-1);}
-
     fgText( float x = 0, float y = 0, char *c = NULL )
-        : x(x), y(y) {strncpy(msg,c,32-1);}
+        : x(x), y(y) {strncpy(msg,c,64-1);}
 
     fgText( const fgText & image )
         : x(image.x), y(image.y) {strcpy(msg,image.msg);}
@@ -434,7 +434,7 @@ class instr_item {  // An Abstract Base Class (ABC)
     }
     void TextString( char *msg, float x, float y )
     {
-        HUD_TextList.add(fgText(msg, x, y));        
+        HUD_TextList.add(fgText(x, y, msg));        
     }
     int getStringWidth ( char *str )
     {
@@ -742,6 +742,7 @@ class HudLadder : public dual_instr_item {
     UINT   minor_div;
     UINT   label_pos;
     UINT   scr_hole;
+    UINT   minimal;
     float vmax;
     float vmin;
     float factor;
@@ -755,6 +756,7 @@ class HudLadder : public dual_instr_item {
                int       y,
                UINT      width,
                UINT      height,
+               UINT      minimal        =    0,
                FLTFNPTR  ptch_source    = get_roll,
                FLTFNPTR  roll_source    = get_pitch,
                float     span_units     = 45.0,