- fix two bugs

[flightgear.git] / src / FDM / flight.hxx

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index dd32bde2cbb03afc0bab4b6ae835e5c720ef585a..09d40bd323532761e2f9c61e6aa7f502af30b084 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -16,7 +16,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.
 //
 // $Id$
 
@@ -369,11 +369,10 @@ public:
     inline void _set_Density( double d ) { density = d; }
     inline void _set_Mach_number( double m ) { mach_number = m; }
     inline void _set_Static_pressure( double sp ) { static_pressure = sp; }
-    inline void _set_Static_temperature( double t ) { static_temperature = t; }
+    inline void _set_Static_temperature( double t ) { static_temperature = t; } 
+    inline void _set_Total_temperature( double tat ) { total_temperature = tat; } //JW
     inline void _set_Sea_level_radius( double r ) { sea_level_radius = r; }
-    inline void _set_Earth_position_angle(double a) {
-       earth_position_angle = a;
-    }
+    inline void _set_Earth_position_angle(double a) { earth_position_angle = a; }
     inline void _set_Runway_altitude( double alt ) { runway_altitude = alt; }
     inline void _set_Climb_Rate(double rate) { climb_rate = rate; }
     inline void _set_sin_lat_geocentric(double parm) {
@@ -1091,7 +1090,6 @@ public:
     enum GroundType {
       Unknown = 0, //??
       Solid, // Whatever we will roll on with infinite load factor.
-      Forest, // Ground unsuitable for taxiing.
       Water, // For the beaver ...
       Catapult, // Carrier cats.
       Wire // Carrier wires.
@@ -1134,14 +1132,17 @@ public:
                     double contact[3], double normal[3], double vel[3],
                     int *type, double *loadCapacity,
                     double *frictionFactor, double *agl);
+
+    // Return the altitude above ground below the wgs84 point pt
+    // Search for the nearest triangle to pt.
+    // Return ground properties like the ground type, a pointer to the
+    // material and finally the altitude above ground.
     bool get_agl_m(double t, const double pt[3], double max_altoff,
                    double contact[3], double normal[3], double vel[3],
-                   int *type, double *loadCapacity,
-                   double *frictionFactor, double *agl);
+                   int *type, const SGMaterial** material, double *agl);
     bool get_agl_ft(double t, const double pt[3], double max_altoff,
                     double contact[3], double normal[3], double vel[3],
-                    int *type, double *loadCapacity,
-                    double *frictionFactor, double *agl);
+                    int *type, const SGMaterial** material, double *agl);
     double get_groundlevel_m(double lat, double lon, double alt);