diff --git a/src/ATC/atcutils.cxx b/src/ATC/atcutils.cxx index 12747c480..589a387e2 100644 --- a/src/ATC/atcutils.cxx +++ b/src/ATC/atcutils.cxx @@ -69,8 +69,8 @@ bool FGCommList::init( const SGPath& path ) { LoadComms(temp); temp = path; temp.append( "ATC/default.approach" ); - LoadComms(temp); - return true;*/ + LoadComms(temp);*/ + return true; } @@ -107,9 +107,8 @@ bool FGCommList::LoadComms(const SGPath& path) { fin >> skipcomment; } - fin.close(); + fin.close();*/ return true; -*/ } @@ -160,13 +159,14 @@ bool FGCommList::FindByFreq(const SGGeod& aPos, double freq, return false; } */ + return false; } int FGCommList::FindByPos(const SGGeod& aPos, double range, comm_list_type* stations, atc_type tp) { -/* // number of relevant stations found within range int found = 0; +/* stations->erase(stations->begin(), stations->end()); // get bucket number for plane position @@ -203,8 +203,8 @@ int FGCommList::FindByPos(const SGGeod& aPos, double range, comm_list_type* stat } } } - return found; */ + return found; } @@ -248,8 +248,8 @@ double FGCommList::FindClosest(const SGGeod& aPos, ATCData& ad, atc_type tp, dou } range *= 10; } - return(-9999.0); */ + return(-9999.0); } @@ -277,8 +277,8 @@ bool FGCommList::FindByCode( const string& ICAO, ATCData& ad, atc_type tp ) { } } } - return false; */ + return false; } // TODO - this function should move somewhere else eventually! @@ -312,6 +312,7 @@ int FGCommList::GetAtisSequence( const string& apt_id, // << " Delta: " << delta << endl; return(tran.sequence + (delta ? 0 : LTRS*1000)); */ + return 2600; } /***************************************************************************** * FGKln89AlignedProjection @@ -369,4 +370,4 @@ SGGeod FGKln89AlignedProjection::ConvertFromLocal(const SGVec3d& pt) { return SGGeod::fromRadM(_origin.getLongitudeRad()+delta_lon, _origin.getLatitudeRad()+delta_lat, pt.z()); } -#endif // #ENABLE_ATCDCL \ No newline at end of file +#endif // #ENABLE_ATCDCL diff --git a/src/ATC/trafficcontrol.cxx b/src/ATC/trafficcontrol.cxx index 7848de10e..ba00b6019 100644 --- a/src/ATC/trafficcontrol.cxx +++ b/src/ATC/trafficcontrol.cxx @@ -38,15 +38,16 @@ FGTrafficRecord::FGTrafficRecord() : id(0), waitsForId(0), currentPos(0), leg(0), + frequencyId(0), state(0), + allowTransmission(true), latitude(0), longitude(0), heading(0), speed(0), altitude(0), - radius(0), - frequencyId(0), - allowTransmission(true) { + radius(0) +{ } void FGTrafficRecord::setPositionAndIntentions(int pos, FGAIFlightPlan *route) diff --git a/src/Main/options.cxx b/src/Main/options.cxx index a994f5953..abcd85535 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -1661,7 +1661,7 @@ fgParseArgs (int argc, char **argv) cout << endl << "No. Device" << endl; vector devices = smgr.get_available_devices(); - for (int i=0; i::size_type i=0; iwrite_port( package.c_str(), package.length() ); if ( result != package.length() ) { - printf("ERROR: wrote %d of %d bytes to serial port!\n", - result, package.length() ); + printf("ERROR: wrote %u of %u bytes to serial port!\n", + result, (unsigned)package.length() ); return 0; } @@ -88,7 +88,7 @@ int UGCommand::update( SGSerialPort *serial ) // send the command string command = cmd_queue.front(); - int result = serial_send( serial, cmd_send_index, command ); + /*int result =*/ serial_send( serial, cmd_send_index, command ); return cmd_send_index; } diff --git a/utils/GPSsmooth/gps_main.cxx b/utils/GPSsmooth/gps_main.cxx index cb70e3bc0..f5a10d7ac 100644 --- a/utils/GPSsmooth/gps_main.cxx +++ b/utils/GPSsmooth/gps_main.cxx @@ -276,7 +276,7 @@ static void gps2fg( const GPSPoint p, FGNetFDM *fdm, FGNetCtrls *ctrls ) static void send_data( const GPSPoint p ) { int len; - int ctrlsize = sizeof( FGNetCtrls ); +// int ctrlsize = sizeof( FGNetCtrls ); int fdmsize = sizeof( FGNetFDM ); // cout << "Running main loop" << endl;