Fixed reporting of winds, cloudbase, and altimeter setting. The

temperature is still wrong.

diff --git a/src/ATC/atis.cxx b/src/ATC/atis.cxx
index d2225410e4f1e04b4a7e350a5f98b830cfa2c117..758df527ec26d091385a4b95e646650de418f405 100644 (file)
--- a/src/ATC/atis.cxx
+++ b/src/ATC/atis.cxx
@@ -180,15 +180,12 @@ void FGATIS::UpdateTransmission() {
 #ifdef FG_WEATHERCM
     sprintf(buf, "%i", int(stationweather.Temperature - 273.15));
 #else
-    sprintf(buf, "%i", int(stationweather.get_temperature_degc()));
+    sprintf(buf, "%d", int(stationweather.get_temperature_degc()));
 #endif
     transmission += "  Temperature ";
     transmission += buf;
     transmission += " degrees Celsius";
 
-       // Get the pressure / altimeter
-        // pressure is: stationweather.AirPressure in Pascal
-
        // Get the visibility
 #ifdef FG_WEATHERCM
        visibility = fgGetDouble("/environment/visibility-m");
@@ -202,8 +199,7 @@ void FGATIS::UpdateTransmission() {
 
        // Get the cloudbase
        // FIXME: kludge for now
-       if (!strcmp(fgGetString("/environment/clouds/layer[0]/type"),
-                   "clear")) {
+       if (strcmp(fgGetString("/environment/clouds/layer[0]/type"), "clear")) {
            double cloudbase =
              fgGetDouble("/environment/clouds/layer[0]/elevation-ft");
            // For some reason the altitude returned doesn't seem to correspond to the actual cloud altitude.
@@ -213,6 +209,15 @@ void FGATIS::UpdateTransmission() {
            transmission = transmission + "  Cloudbase " + buf3 + " feet";
        }
 
+       // Get the pressure / altimeter
+
+#ifndef FG_WEATHERCM
+      double altimeter = stationweather.get_pressure_sea_level_inhg();
+      sprintf(buf, "%.2f", altimeter);
+      transmission += "  Altimeter ";
+      transmission += buf;
+#endif
+
        // Based on the airport-id and wind get the active runway
        //FGRunway *r;
        SGPath path( globals->get_fg_root() );
@@ -255,6 +260,7 @@ void FGATIS::UpdateTransmission() {
            char buf2[72];
            sprintf(buf2, "%s %i %s %i %s", "  Winds ", int(speed),
                    " knots from ", int(hdg), " degrees");
+           transmission += buf2;
        }
 #endif