X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fhud_ladr.cxx;h=34b58d0eb7bf0a5286b1f5ab524a0deee037a193;hb=75c508b82cd734552ccf3468a0e73bf1df51ad30;hp=a724b5404640086729b00c8f4dd5796be7ec9862;hpb=d336553d75f35aebe282ce16cdb0be64635bbbba;p=flightgear.git diff --git a/src/Cockpit/hud_ladr.cxx b/src/Cockpit/hud_ladr.cxx index a724b5404..34b58d0eb 100644 --- a/src/Cockpit/hud_ladr.cxx +++ b/src/Cockpit/hud_ladr.cxx @@ -6,7 +6,7 @@ #include "hud.hxx" #include "panel.hxx" - +#include
// FIXME extern float get_roll(void); @@ -51,7 +51,7 @@ HudLadder::HudLadder(const SGPropertyNode *node) : if (fgGetBool("/sim/hud/enable3d", true) && HUD_style == 1) factor = 640.0 / 55.0; - SG_LOG(SG_INPUT, SG_INFO, "Done reading HudLadder instrument" + SG_LOG(SG_INPUT, SG_BULK, "Done reading HudLadder instrument" << node->getStringValue("name", "[unnamed]")); if (!width_units) @@ -94,7 +94,7 @@ void HudLadder::draw(void) alpha = get_aoa(); pla = get_throttleval(); -#ifdef ENABLE_SP_FMDS +#ifdef ENABLE_SP_FDM int lgear, wown, wowm, ilcanclaw, ihook; ilcanclaw = get_iaux2(); lgear = get_iaux3(); @@ -247,7 +247,7 @@ void HudLadder::draw(void) glVertex2f(vel_x, vel_y + 6); glEnd(); -#ifdef ENABLE_SP_FMDS +#ifdef ENABLE_SP_FDM // OBJECT MOVING RETICLE // TYPE LINE // ATTRIB - ON CONDITION @@ -295,7 +295,7 @@ void HudLadder::draw(void) // TYPE - SQUARE_BRACKET // ATTRIB - ON CONDITION // alpha bracket -#ifdef ENABLE_SP_FMDS +#ifdef ENABLE_SP_FDM if (alpha_bracket && ihook == 1) { glBegin(GL_LINE_STRIP); glVertex2f(vel_x - 20 , vel_y - (16 - alpha) * factor); @@ -365,7 +365,7 @@ void HudLadder::draw(void) // OBJECT STATIC RETICLE // TYPE LINE // ATTRIB - ON CONDITION -#ifdef ENABLE_SP_FMDS +#ifdef ENABLE_SP_FDM if (energy_worm && ilcanclaw == 1) { glBegin(GL_LINE_STRIP); glVertex2f(-15, -134); @@ -448,8 +448,8 @@ void HudLadder::draw(void) LineList.erase(); StippleLineList.erase(); - int last = FloatToInt(vmax) + 1; - int i = FloatToInt(vmin); + int last = float_to_int(vmax) + 1; + int i = float_to_int(vmin); if (!scr_hole) { x_end = half_span; @@ -562,7 +562,7 @@ void HudLadder::draw(void) // TYPE LINE // ATTRIB - ON CONDITION // draw appraoch glide slope marker -#ifdef ENABLE_SP_FMDS +#ifdef ENABLE_SP_FDM if (glide_slope_marker && ihook) { Line(-half_span + 15, (glide_slope-actslope) * factor, -half_span + hole, (glide_slope - actslope) * factor); @@ -590,7 +590,7 @@ void HudLadder::draw(void) //************************************************************* //************************************************************* -#ifdef ENABLE_SP_FMDS +#ifdef ENABLE_SP_FDM if (waypoint_marker) { //waypoint marker computation float fromwp_lat, towp_lat, fromwp_lon, towp_lon, dist, delx, dely, hyp, theta, brg;