- fix two bugs

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

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 69db8c4102ba923fe6e2fccd67282a2c5eca97bc..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$
 
@@ -1090,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.
@@ -1133,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);