1
0
Fork 0

Remove stale includes, use local ground-speed property.

This commit is contained in:
James Turner 2012-05-11 17:07:21 +01:00
parent b91175d47a
commit 79391f818c

View file

@ -41,11 +41,7 @@
#include <simgear/misc/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/structure/commands.hxx> #include <simgear/structure/commands.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/route/route.hxx>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>
#include "Main/fg_props.hxx" #include "Main/fg_props.hxx"
@ -54,12 +50,11 @@
#include <Navaids/procedure.hxx> #include <Navaids/procedure.hxx>
#include "Airports/simple.hxx" #include "Airports/simple.hxx"
#include "Airports/runways.hxx" #include "Airports/runways.hxx"
#define RM "/autopilot/route-manager/"
#include <GUI/new_gui.hxx> #include <GUI/new_gui.hxx>
#include <GUI/dialog.hxx> #include <GUI/dialog.hxx>
#define RM "/autopilot/route-manager/"
using namespace flightgear; using namespace flightgear;
static bool commandLoadFlightPlan(const SGPropertyNode* arg) static bool commandLoadFlightPlan(const SGPropertyNode* arg)
@ -557,7 +552,7 @@ int FGRouteMgr::numLegs() const
void FGRouteMgr::setETAPropertyFromDistance(SGPropertyNode_ptr aProp, double aDistance) void FGRouteMgr::setETAPropertyFromDistance(SGPropertyNode_ptr aProp, double aDistance)
{ {
double speed = fgGetDouble("/velocities/groundspeed-kt", 0.0); double speed = groundSpeed->getDoubleValue();
if (speed < 1.0) { if (speed < 1.0) {
aProp->setStringValue("--:--"); aProp->setStringValue("--:--");
return; return;