fix another crash on exit by finally converting the rest of unguarded

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

diff --git a/src/ATC/atis.cxx b/src/ATC/atis.cxx
index 8e7079cd5ac41b6dda6faa0d727547ef7a0edf15..c4caefdd6303212fa5d24e21fad2edc1228d3c26 100644 (file)
--- a/src/ATC/atis.cxx
+++ b/src/ATC/atis.cxx
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 #ifdef HAVE_CONFIG_H
@@ -56,8 +56,8 @@ FGATIS::FGATIS() :
        refname("atis")
        //type(ATIS)
 {
-       vPtr = globals->get_ATC_mgr()->GetVoicePointer(ATIS);
-       voiceOK = (vPtr == NULL ? false : true);
+       _vPtr = globals->get_ATC_mgr()->GetVoicePointer(ATIS);
+       _voiceOK = (_vPtr == NULL ? false : true);
        _type = ATIS;
 }
 
@@ -100,7 +100,7 @@ void FGATIS::UpdateTransmission() {
        
        FGEnvironment stationweather =
             ((FGEnvironmentMgr *)globals->get_subsystem("environment"))
-              ->getEnvironment(lat, lon, elev);
+              ->getEnvironment(lat, lon, 0.0);
        
        transmission = "";
        
@@ -181,10 +181,10 @@ void FGATIS::UpdateTransmission() {
        
        // Get the pressure / altimeter
        double P = fgGetDouble("/environment/pressure-sea-level-inhg");
-       if(ident.substr(0,2) == "EG") {
+       if(ident.substr(0,2) == "EG" && fgGetBool("/sim/atc/use-millibars") == true) {
                // Convert to millibars for the UK!
                P *= 33.864;
-               sprintf(buf, "%.1f", P);
+               sprintf(buf, "%.0f", P);
        } else {
                sprintf(buf, "%.2f", P);
        }