#include <simgear/compiler.h>
+#include <simgear/route/route.hxx>
+
#include <assert.h>
#include <stdlib.h>
#include <string.h>
float alt = cur_fdm_state->get_Altitude();
- if ( fgGetString("/sim/startup/units") == "meters") {
+ if ( !strcmp(fgGetString("/sim/startup/units"), "meters")) {
alt *= SG_FEET_TO_METER;
}
TgtAptId = tmp.substr( 0, pos );
string alt_str = tmp.substr( pos + 1 );
alt = atof( alt_str.c_str() );
- if ( fgGetString("/sim/startup/units") == "feet" ) {
+ if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) {
alt *= SG_FEET_TO_METER;
}
} else {
globals->get_autopilot()->set_HeadingEnabled( true );
globals->get_autopilot()->set_HeadingMode( FGAutopilot::FG_HEADING_WAYPOINT );
- } else if ( current_fixlist->query( TgtAptId, 0.0, 0.0, 0.0,
- &f, &t1, &t2 ) )
+ } else if ( current_fixlist->query( TgtAptId, &f ) )
{
SG_LOG( SG_GENERAL, SG_INFO,
"Adding waypoint (fix) = " << TgtAptId );
void TgtAptDialog_Reset(puObject *)
{
- sprintf( NewTgtAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+ sprintf( NewTgtAirportId, "%s", fgGetString("/sim/presets/airport-id") );
TgtAptDialogInput->setValue ( NewTgtAirportId );
TgtAptDialogInput->setCursor( 0 ) ;
}
void AddWayPoint(puObject *cb)
{
- sprintf( NewTgtAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+ sprintf( NewTgtAirportId, "%s", fgGetString("/sim/presets/airport-id") );
TgtAptDialogInput->setValue( NewTgtAirportId );
/* refresh waypoint list */
WPList = new char* [ WPListsize + 1 ];
for (i = 0; i < globals->get_route()->size(); i++ ) {
sprintf(WPString, "%5s %3.2flon %3.2flat", globals->get_route()->get_waypoint(i).get_id().c_str(), globals->get_route()->get_waypoint(i).get_target_lon(), globals->get_route()->get_waypoint(i).get_target_lat());
- WPList [i] = new char[ strlen(WPString) ];
+ WPList [i] = new char[ strlen(WPString)+1 ];
strcpy ( WPList [i], WPString );
}
} else {
void NewTgtAirportInit()
{
SG_LOG( SG_AUTOPILOT, SG_INFO, " enter NewTgtAirportInit()" );
- sprintf( NewTgtAirportId, "%s",
- fgGetString("/sim/startup/airport-id").c_str() );
+ sprintf( NewTgtAirportId, "%s", fgGetString("/sim/presets/airport-id") );
SG_LOG( SG_AUTOPILOT, SG_INFO, " NewTgtAirportId " << NewTgtAirportId );
- int len = 150
- - puGetDefaultLabelFont().getStringWidth( NewTgtAirportLabel ) / 2;
TgtAptDialog = new puDialogBox (150, 350);
{