Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next

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

diff --git a/src/Cockpit/hud_rwy.cxx b/src/Cockpit/hud_rwy.cxx
index 321d20d3e581afa8a7565e539e3416b267a5fd0b..2be1525238ed305f108362535a501862316f8476 100644 (file)
--- a/src/Cockpit/hud_rwy.cxx
+++ b/src/Cockpit/hud_rwy.cxx
@@ -27,12 +27,10 @@
 #include <math.h>
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
-#include <Aircraft/aircraft.hxx>
 #include <Environment/environment.hxx>
 #include <Environment/environment_mgr.hxx>
-#include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/polar3d.hxx>
 #include <ATCDCL/ATCutils.hxx>
+#include <Main/viewer.hxx>
 
 #include <osg/GLU>
 
@@ -61,7 +59,7 @@ runway_instr::runway_instr(const SGPropertyNode *node) :
     drawIA(arrowScale > 0 ? true : false),
     drawIAAlways(arrowScale > 0 ? node->getBoolValue("arrow_always") : false)
 {
-    SG_LOG(SG_INPUT, SG_INFO, "Done reading runway instrument "
+    SG_LOG(SG_INPUT, SG_BULK, "Done reading runway instrument "
             << node->getStringValue("name", "[unnamed]"));
 
     view[0] = 0;
@@ -186,10 +184,10 @@ FGRunway* runway_instr::get_active_runway()
 
 void runway_instr::get_rwy_points(sgdVec3 *points3d)
 {
-    double alt = current_aircraft.fdm_state->get_Runway_altitude() * SG_FEET_TO_METER;
+    double alt = runway->geod().getElevationM();
     double length = runway->lengthM() * 0.5;
     double width = runway->widthM() * 0.5;
-    double frontLat, frontLon, backLat, backLon,az, tempLat, tempLon;
+    double frontLat = 0.0, frontLon = 0.0, backLat = 0.0, backLon = 0.0, az = 0.0, tempLat = 0.0, tempLon = 0.0;
     double runwayLon = runway->geod().getLongitudeDeg(),
       runwayLat = runway->geod().getLatitudeDeg();
     double heading = runway->headingDeg();