remove obsolete constants

[flightgear.git] / src / Cockpit / hud_ladr.cxx

diff --git a/src/Cockpit/hud_ladr.cxx b/src/Cockpit/hud_ladr.cxx
index 2ce6b2423b922ff8e36aea7312f79407ed8f9dd5..dfc815a70a29f3e32ad515188b29c96490e57cfe 100644 (file)
--- a/src/Cockpit/hud_ladr.cxx
+++ b/src/Cockpit/hud_ladr.cxx
@@ -1,11 +1,17 @@
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <simgear/constants.h>
+
 #include "hud.hxx"
 #include "panel.hxx"
 
 #define DO_PANEL_HACK
 
 //====================== Top of HudLadder Class =======================
-HudLadder ::   HudLadder(  string name,
+HudLadder ::   HudLadder(  const string& name,
                           int       x,
                           int       y,
                           UINT      width,
@@ -161,13 +167,14 @@ void HudLadder :: draw( void )
     alpha = get_aoa();
     pla = get_throttleval();
 
+#ifdef ENABLE_SP_FMDS
     int lgear,wown,wowm,ilcanclaw,ihook;
     ilcanclaw = get_iaux2();
     lgear = get_iaux3();
     wown = get_iaux4();
     wowm = get_iaux5();
     ihook = get_iaux6();
-    
+#endif
     float pitch_value = current_ch1() * SGD_RADIANS_TO_DEGREES;
        
     if(hudladder_type=="Climb/Dive Ladder") {
@@ -291,8 +298,8 @@ void HudLadder :: draw( void )
        //  velocity vector
        glBegin(GL_LINE_LOOP);  // Use polygon to approximate a circle 
         for(count=0; count<50; count++) {             
-           cosine = 6 * cos(count * 2 * SGD_PI/50.0); 
-            sine =   6 * sin(count * 2 * SGD_PI/50.0); 
+           cosine = 6 * cos(count * SGD_2PI/50.0); 
+            sine =   6 * sin(count * SGD_2PI/50.0); 
             glVertex2f(cosine+vel_x, sine+vel_y);
        }     
        glEnd(); 
@@ -310,6 +317,7 @@ void HudLadder :: draw( void )
        glVertex2f(vel_x, vel_y+6);
        glEnd();
 
+#ifdef ENABLE_SP_FMDS
        // OBJECT MOVING RETICLE
        // TYPE LINE
        // ATTRIB - ON CONDITION
@@ -346,6 +354,7 @@ void HudLadder :: draw( void )
            glVertex2f(vel_x+4, vel_y-8);
            glEnd();
        }
+#endif
     }//if velocity_vector
 
     //***************************************************************
@@ -353,6 +362,7 @@ void HudLadder :: draw( void )
     // TYPE - SQUARE_BRACKET
     // ATTRIB - ON CONDITION
     // alpha bracket
+#ifdef ENABLE_SP_FMDS
     if (alpha_bracket) {
        if (ihook == 1) {
            glBegin(GL_LINE_STRIP);
@@ -369,6 +379,7 @@ void HudLadder :: draw( void )
            glEnd();
        }
     }
+#endif
     //printf("xvr=%f,yvr=%f,Vx=%f,Vy=%f,Vz=%f\n",xvvr,yvvr,Vx,Vy,Vz);
     //printf("Ax=%f,Ay=%f,Az=%f\n",Ax,Ay,Az);
     //**************************************************************** 
@@ -417,6 +428,7 @@ void HudLadder :: draw( void )
     // OBJECT STATIC RETICLE
     // TYPE LINE
     // ATTRIB - ON CONDITION
+#ifdef ENABLE_SP_FMDS
     if (energy_worm)   {
        if (ilcanclaw == 1) {
            glBegin(GL_LINE_STRIP);
@@ -443,6 +455,7 @@ void HudLadder :: draw( void )
            glEnd();
        }
     }
+#endif
     //*************************************************************
     // OBJECT MOVING RETICLE
     // TYPE DIAMOND
@@ -645,12 +658,14 @@ void HudLadder :: draw( void )
                // TYPE LINE
                // ATTRIB - ON CONDITION
                // draw appraoch glide slope marker
+#ifdef ENABLE_SP_FMDS
                if (glide_slope_marker) {
                    if (ihook) {
                        Line(-half_span+15, (glide_slope-actslope)*factor, -half_span + hole, (glide_slope-actslope)*factor);
                        Line(half_span-15, (glide_slope-actslope)*factor, half_span - hole, (glide_slope-actslope)*factor);
                    }
                }// if glide_slope_marker
+#endif
            }
         TextList.draw();
 
@@ -670,6 +685,7 @@ void HudLadder :: draw( void )
     glPopMatrix();
     //*************************************************************
     //*************************************************************
+#ifdef ENABLE_SP_FMDS
     if(waypoint_marker) {
        //waypoint marker computation
        float fromwp_lat,towp_lat,fromwp_lon,towp_lon,dist,delx,dely,hyp,theta,brg;
@@ -758,6 +774,7 @@ void HudLadder :: draw( void )
 
          } //brg<12
     } // if waypoint_marker
+#endif
 }//draw
 
 /******************************************************************/
@@ -813,8 +830,7 @@ drawNadir(float xfirst, float xlast, float yvalue)
 
 
                float r = 7.5;
-               float ang,temp;
-               float x1,y1,x2,y2,xcent,ycent;
+               float x1,y1,x2,y2;
 
        
         // to draw a circle