#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
#include <Airports/simple.hxx>
#include <GUI/gui.h>
-#include <Main/bfi.hxx>
#include <Main/fg_init.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
char NewHeadingLabel[] = "Enter New Heading";
char *s;
- float heading = FGBFI::getHeading();
+ float heading = fgGetDouble("/orientation/heading");
int len = 260/2 -
(puGetStringWidth( puGetDefaultLabelFont(), NewHeadingLabel ) /2 );
float alt = cur_fdm_state->get_Altitude();
if ( fgGetString("/sim/startup/units") == "meters") {
- alt *= FEET_TO_METER;
+ alt *= SG_FEET_TO_METER;
}
int len = 260/2 -
string tmp = s;
double alt = 0.0;
- int pos = tmp.find( "@" );
+ unsigned int pos = tmp.find( "@" );
if ( pos != string::npos ) {
TgtAptId = tmp.substr( 0, pos );
string alt_str = tmp.substr( pos + 1 );
alt = atof( alt_str.c_str() );
if ( fgGetString("/sim/startup/units") == "feet" ) {
- alt *= FEET_TO_METER;
+ alt *= SG_FEET_TO_METER;
}
} else {
TgtAptId = tmp;
double t1, t2;
if ( fgFindAirportID( TgtAptId, &a ) ) {
- FG_LOG( FG_GENERAL, FG_INFO,
+ SG_LOG( SG_GENERAL, SG_INFO,
"Adding waypoint (airport) = " << TgtAptId );
sprintf( NewTgtAirportId, "%s", TgtAptId.c_str() );
} else if ( current_fixlist->query( TgtAptId, 0.0, 0.0, 0.0,
&f, &t1, &t2 ) )
{
- FG_LOG( FG_GENERAL, FG_INFO,
+ SG_LOG( SG_GENERAL, SG_INFO,
"Adding waypoint (fix) = " << TgtAptId );
sprintf( NewTgtAirportId, "%s", TgtAptId.c_str() );
void TgtAptDialog_Reset(puObject *)
{
- // strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
sprintf( NewTgtAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
TgtAptDialogInput->setValue ( NewTgtAirportId );
TgtAptDialogInput->setCursor( 0 ) ;
void AddWayPoint(puObject *cb)
{
- // strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
sprintf( NewTgtAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
TgtAptDialogInput->setValue( NewTgtAirportId );
current_autopilot->set_HeadingMode( FGAutopilot::FG_TC_HEADING_LOCK );
// use current heading
- current_autopilot->set_TargetHeading( FGBFI::getHeading() );
+ current_autopilot
+ ->set_TargetHeading(fgGetDouble("/orientation/heading"));
}
}
void NewTgtAirportInit(void)
{
- FG_LOG( FG_AUTOPILOT, FG_INFO, " enter NewTgtAirportInit()" );
- // fgAPset_tgt_airport_id( fgGetString("/sim/startup/airport-id") );
- sprintf( NewTgtAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
- FG_LOG( FG_AUTOPILOT, FG_INFO, " NewTgtAirportId " << NewTgtAirportId );
- // printf(" NewTgtAirportId %s\n", NewTgtAirportId);
+ SG_LOG( SG_AUTOPILOT, SG_INFO, " enter NewTgtAirportInit()" );
+ sprintf( NewTgtAirportId, "%s",
+ fgGetString("/sim/startup/airport-id").c_str() );
+ SG_LOG( SG_AUTOPILOT, SG_INFO, " NewTgtAirportId " << NewTgtAirportId );
int len = 150 - puGetStringWidth( puGetDefaultLabelFont(),
NewTgtAirportLabel ) / 2;