Fix the nmea and garmin output to a) fake a GSA sentence, b) fix a y2k bug

[flightgear.git] / src / ATC / atis.cxx

diff --git a/src/ATC/atis.cxx b/src/ATC/atis.cxx
index 0021875dc2740f4f69b28bff5e21b8c52008cea9..4c56b23a44234ca177e7bb5189c10fe89675907f 100644 (file)
--- a/src/ATC/atis.cxx
+++ b/src/ATC/atis.cxx
@@ -34,8 +34,6 @@ SG_USING_STD(string);
 #include STL_IOSTREAM
 SG_USING_STD(cout);
 
-//#include <simgear/debug/logstream.hxx>
-//#include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 
 #ifdef FG_WEATHERCM
@@ -51,26 +49,23 @@ SG_USING_STD(cout);
 
 #include "atis.hxx"
 #include "commlist.hxx"
-//#include "atislist.hxx"
 #include "ATCdisplay.hxx"
 #include "ATCutils.hxx"
 #include "ATCmgr.hxx"
 
-// Constructor
 FGATIS::FGATIS() :
-display(false),
-displaying(false),
-transmission(""),
-trans_ident(""),
-atis_failed(false),
-refname("atis")
-//type(ATIS)
+       display(false),
+       displaying(false),
+       transmission(""),
+       trans_ident(""),
+       atis_failed(false),
+       refname("atis")
+       //type(ATIS)
 {
        vPtr = globals->get_ATC_mgr()->GetVoicePointer(ATIS);
        voiceOK = (vPtr == NULL ? false : true);
 }
 
-// Destructor
 FGATIS::~FGATIS() {
 }
 
@@ -113,7 +108,8 @@ void FGATIS::UpdateTransmission() {
        FGPhysicalProperty stationweather = WeatherDatabase->get(position);
        #else
        FGEnvironment stationweather =
-       globals->get_environment_mgr()->getEnvironment(lat, lon, elev);
+            ((FGEnvironmentMgr *)globals->get_subsystem("environment"))
+              ->getEnvironment(lat, lon, elev);
        #endif
        
        transmission = "";
@@ -213,11 +209,7 @@ void FGATIS::UpdateTransmission() {
        
        // Based on the airport-id and wind get the active runway
        //FGRunway *r;
-       SGPath path( globals->get_fg_root() );
-       path.append( "Airports" );
-       path.append( "runways.mk4" );
-       FGRunways runways( path.c_str() );
-       
+
        #ifdef FG_WEATHERCM
        //Set the heading to into the wind
        double wind_x = stationweather.Wind[0];
@@ -268,8 +260,8 @@ void FGATIS::UpdateTransmission() {
        }
        #endif
        
-       string rwy_no = runways.search(ident, int(hdg));
-       if(rwy_no != (string)"NN") {
+       string rwy_no = globals->get_runways()->search(ident, int(hdg));
+       if(rwy_no != "NN") {
                transmission += " / Landing_and_departing_runway ";
                transmission += ConvertRwyNumToSpokenString(atoi(rwy_no.c_str()));
                //cout << "in atis.cxx, r.rwy_no = " << rwy_no << " r.id = " << r->id << " r.heading = " << r->heading << endl;